diff --git a/.ci/ansible_install.py b/.ci/ansible_install.py index 2bfe15ba..f4f3baa5 100755 --- a/.ci/ansible_install.py +++ b/.ci/ansible_install.py @@ -12,12 +12,15 @@ batches = [ '-r tests/requirements.txt ' '-r tests/ansible/requirements.txt', 'pip install -q ansible=={0}'.format(ci_lib.ANSIBLE_VERSION) + ], + [ + 'aws ecr-public get-login-password | docker login --username AWS --password-stdin public.ecr.aws', ] ] -batches.append(ci_lib.throttle( +batches[-1].extend([ 'docker pull %s' % (ci_lib.image_for_distro(distro),) for distro in ci_lib.DISTROS -)) +]) ci_lib.run_batches(batches) diff --git a/.ci/azure-pipelines-steps.yml b/.ci/azure-pipelines-steps.yml index 9acfa7b1..1f318d11 100644 --- a/.ci/azure-pipelines-steps.yml +++ b/.ci/azure-pipelines-steps.yml @@ -39,6 +39,10 @@ steps: - script: .ci/$(MODE)_install.py displayName: "Run $(MODE)_install.py" + env: + AWS_ACCESS_KEY_ID: $(AWS_ACCESS_KEY_ID) + AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY) + AWS_DEFAULT_REGION: $(AWS_DEFAULT_REGION) - script: .ci/$(MODE)_tests.py displayName: "Run $(MODE)_tests.py" diff --git a/.ci/debops_common_install.py b/.ci/debops_common_install.py index 32241449..46115ea7 100755 --- a/.ci/debops_common_install.py +++ b/.ci/debops_common_install.py @@ -13,6 +13,7 @@ ci_lib.run_batches([ 'pip install -qqqU debops==0.7.2 ansible==%s' % ci_lib.ANSIBLE_VERSION, ], [ + 'aws ecr-public get-login-password | docker login --username AWS --password-stdin public.ecr.aws', 'docker pull %s' % (ci_lib.image_for_distro('debian'),), ], ]) diff --git a/.ci/mitogen_install.py b/.ci/mitogen_install.py index b8862f89..d51c2f17 100755 --- a/.ci/mitogen_install.py +++ b/.ci/mitogen_install.py @@ -11,6 +11,7 @@ batches = [ if ci_lib.have_docker(): batches.append([ + 'aws ecr-public get-login-password | docker login --username AWS --password-stdin public.ecr.aws', 'docker pull %s' % (ci_lib.image_for_distro(ci_lib.DISTRO),), ]) diff --git a/.ci/mitogen_py24_install.py b/.ci/mitogen_py24_install.py index 868ae4e4..92294aab 100755 --- a/.ci/mitogen_py24_install.py +++ b/.ci/mitogen_py24_install.py @@ -4,6 +4,7 @@ import ci_lib batches = [ [ + 'aws ecr-public get-login-password | docker login --username AWS --password-stdin public.ecr.aws', 'docker pull %s' % (ci_lib.image_for_distro(ci_lib.DISTRO),), ], [