diff --git a/.zuul.yaml b/.zuul.yaml index 554284e0e..87644e8a5 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -45,6 +45,8 @@ post-run: tools/gate/playbooks/debug-report.yaml required-projects: - name: openstack/airship-armada + # NOTE(drewwalters96): Temporarily pin Armada to K8s v2.11.0. + override-checkout: dd75474d78e69f3634eb94c8ea6730b898e83277 - name: openstack/airship-deckhand - name: openstack/airship-pegleg - name: openstack/airship-shipyard diff --git a/tools/deployment/airskiff/developer/005-make-airship.sh b/tools/deployment/airskiff/developer/005-make-airship.sh index e874d825a..901071189 100755 --- a/tools/deployment/airskiff/developer/005-make-airship.sh +++ b/tools/deployment/airskiff/developer/005-make-airship.sh @@ -25,7 +25,10 @@ CURRENT_DIR="$(pwd)" cd ${INSTALL_PATH} git clone https://git.openstack.org/openstack/airship-armada.git -cd airship-armada && make images +cd airship-armada +# NOTE(drewwalters96): Temporarily pin Armada to K8s v2.11.0. +git checkout dd75474d78e69f3634eb94c8ea6730b898e83277 +make images IMAGE_TAG=dd75474d78e69f3634eb94c8ea6730b898e83277 cd ${INSTALL_PATH} git clone https://git.openstack.org/openstack/airship-deckhand.git diff --git a/tools/deployment/airskiff/developer/030-armada-bootstrap.sh b/tools/deployment/airskiff/developer/030-armada-bootstrap.sh index 8177f3e17..e453ad3ab 100755 --- a/tools/deployment/airskiff/developer/030-armada-bootstrap.sh +++ b/tools/deployment/airskiff/developer/030-armada-bootstrap.sh @@ -20,9 +20,10 @@ set -xe : "${INSTALL_PATH:="$(pwd)/../"}" # Download latest Armada image and deploy Airship components +# NOTE(drewwalters96): Temporarily pin Armada to K8s v2.11.0. docker run --rm --net host -p 8000:8000 --name armada \ -v ~/.kube/config:/armada/.kube/config \ -v "$(pwd)"/tools/deployment/airskiff/manifests/:/manifests \ -v "${INSTALL_PATH}":/airship-components \ - quay.io/airshipit/armada:latest \ + quay.io/airshipit/armada:dd75474d78e69f3634eb94c8ea6730b898e83277 \ apply /manifests/airship.yaml