From 5fc01c0a1d330fe0dc6cae378361093230445ef4 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Tue, 26 May 2020 14:05:46 -0700 Subject: [PATCH] Use a custom build container on Shippable. (#69660) * Use a custom build container on Shippable. This supports key generation before git_sync, to avoid issues with pre-migration PRs. If the node pool is switched to another version, a matching build container should be built and used. * Don't kill our own custom container. --- shippable.yml | 5 +++++ test/utils/shippable/shippable.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 05c9d322d7e..18b38cd61b3 100644 --- a/shippable.yml +++ b/shippable.yml @@ -151,6 +151,11 @@ branches: - "revert-*-*" build: + pre_ci_boot: + image_name: quay.io/ansible/shippable-build-container + image_tag: 6.10.4.0 + pull: true + options: --privileged=true --net=bridge ci: - test/utils/shippable/timing.sh test/utils/shippable/shippable.sh $T diff --git a/test/utils/shippable/shippable.sh b/test/utils/shippable/shippable.sh index 4141eee87ff..55d68289714 100755 --- a/test/utils/shippable/shippable.sh +++ b/test/utils/shippable/shippable.sh @@ -13,7 +13,7 @@ docker images ansible/ansible docker images quay.io/ansible/* docker ps -for container in $(docker ps --format '{{.Image}} {{.ID}}' | grep -v '^drydock/' | sed 's/^.* //'); do +for container in $(docker ps --format '{{.Image}} {{.ID}}' | grep -v -e '^drydock/' -e '^quay.io/ansible/shippable-build-container:' | sed 's/^.* //'); do docker rm -f "${container}" || true # ignore errors done