From 8b83f5000312ab3ea46ac05525d050ebe891caf2 Mon Sep 17 00:00:00 2001 From: Drew Walters Date: Wed, 13 Feb 2019 14:23:07 -0600 Subject: [PATCH] airskiff: Update OSH-infra pin The version of Armada deployed by Airskiff was recently uplifted. The gate erroneously uses the latest version of OSH-infra, so there was no impact; however, users of the 005-make-airship script experience a Tiller version mismatch due to an older version of K8s. This change uplifts the OSH-infra pin to prevent errors. Change-Id: If8f2c27396ce6c8548598492dfaf5e15174131a2 --- .zuul.yaml | 1 - tools/deployment/airskiff/developer/005-make-airship.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 554284e0e..5a98b8b94 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -49,7 +49,6 @@ - name: openstack/airship-pegleg - name: openstack/airship-shipyard - name: openstack/openstack-helm-infra - override-checkout: 8662018a4dceb82a5d699d9e118caff9e5edb156 irrelevant-files: - ^.*\.rst$ - ^doc/.*$ diff --git a/tools/deployment/airskiff/developer/005-make-airship.sh b/tools/deployment/airskiff/developer/005-make-airship.sh index e874d825a..19d2eb45d 100755 --- a/tools/deployment/airskiff/developer/005-make-airship.sh +++ b/tools/deployment/airskiff/developer/005-make-airship.sh @@ -42,6 +42,6 @@ git clone https://git.openstack.org/openstack/airship-pegleg.git git clone https://git.openstack.org/openstack/openstack-helm-infra.git cd openstack-helm-infra -git checkout 8662018a4dceb82a5d699d9e118caff9e5edb156 +git checkout ef3adc4d0e5d26e74590d2f78400f7e1d800dbcb cd "${CURRENT_DIR}"