Skip to content

Commit

Permalink
Use a custom build container on Shippable. (ansible#69660)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
mattclay authored May 26, 2020
1 parent c987c0c commit 5fc01c0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions shippable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion test/utils/shippable/shippable.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 5fc01c0

Please sign in to comment.