From a11a3cab1057f58c3883fa9cd00213a07d9fb9f4 Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Fri, 5 May 2023 18:28:31 +0200 Subject: [PATCH] Temporarily limit botocore upgrades The latest botocore (1.29.127) breaks the way moto creates SQS queues and we need to limit it temporarily so that it will not fail our tests. Related: https://github.com/getmoto/moto/issues/6286 Related: i#31087 --- Dockerfile.ci | 5 ++++- scripts/docker/entrypoint_ci.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 6169b6066f1e..bf2b44bac180 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1132,7 +1132,10 @@ if [[ ${UPGRADE_BOTO=} == "true" ]]; then echo "${COLOR_BLUE}Upgrading boto3, botocore to latest version to run Amazon tests with them${COLOR_RESET}" echo pip uninstall aiobotocore -y || true - pip install --upgrade boto3 botocore + # Temporarily limit upgrade of botocore to be less than 1.29.127 + # in order to avoid failing on SQS tests + # See https://github.com/getmoto/moto/issues/6286 and https://github.com/apache/airflow/issues/31087 + pip install --upgrade boto3 "botocore<1.29.127" fi readonly SELECTED_TESTS CLI_TESTS API_TESTS PROVIDERS_TESTS CORE_TESTS WWW_TESTS \ ALL_TESTS ALL_PRESELECTED_TESTS diff --git a/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh index ca853e74c90b..bdfd90f4b852 100755 --- a/scripts/docker/entrypoint_ci.sh +++ b/scripts/docker/entrypoint_ci.sh @@ -562,7 +562,10 @@ if [[ ${UPGRADE_BOTO=} == "true" ]]; then echo "${COLOR_BLUE}Upgrading boto3, botocore to latest version to run Amazon tests with them${COLOR_RESET}" echo pip uninstall aiobotocore -y || true - pip install --upgrade boto3 botocore + # Temporarily limit upgrade of botocore to be less than 1.29.127 + # in order to avoid failing on SQS tests + # See https://github.com/getmoto/moto/issues/6286 and https://github.com/apache/airflow/issues/31087 + pip install --upgrade boto3 "botocore<1.29.127" fi readonly SELECTED_TESTS CLI_TESTS API_TESTS PROVIDERS_TESTS CORE_TESTS WWW_TESTS \ ALL_TESTS ALL_PRESELECTED_TESTS