summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Walters <drewwalters96@gmail.com>2019-02-13 14:23:07 -0600
committerDrew Walters <drewwalters96@gmail.com>2019-02-13 14:25:27 -0600
commit8b83f5000312ab3ea46ac05525d050ebe891caf2 (patch)
tree760691fa66652178a2c77f3ab057c7138e060966
parentd33e89a0efb2bd56959f173fba5be2cff3d8d591 (diff)
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
Notes
Notes (review): Code-Review+2: Matt McEuen <matt.mceuen@att.com> Code-Review+2: Bryan Strassner <strassner.bryan@gmail.com> Workflow+1: Bryan Strassner <strassner.bryan@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 14 Feb 2019 03:36:40 +0000 Reviewed-on: https://review.openstack.org/636747 Project: openstack/airship-treasuremap Branch: refs/heads/master
-rw-r--r--.zuul.yaml1
-rwxr-xr-xtools/deployment/airskiff/developer/005-make-airship.sh2
2 files changed, 1 insertions, 2 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 554284e..5a98b8b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -49,7 +49,6 @@
49 - name: openstack/airship-pegleg 49 - name: openstack/airship-pegleg
50 - name: openstack/airship-shipyard 50 - name: openstack/airship-shipyard
51 - name: openstack/openstack-helm-infra 51 - name: openstack/openstack-helm-infra
52 override-checkout: 8662018a4dceb82a5d699d9e118caff9e5edb156
53 irrelevant-files: 52 irrelevant-files:
54 - ^.*\.rst$ 53 - ^.*\.rst$
55 - ^doc/.*$ 54 - ^doc/.*$
diff --git a/tools/deployment/airskiff/developer/005-make-airship.sh b/tools/deployment/airskiff/developer/005-make-airship.sh
index e874d82..19d2eb4 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
42git clone https://git.openstack.org/openstack/openstack-helm-infra.git 42git clone https://git.openstack.org/openstack/openstack-helm-infra.git
43 43
44cd openstack-helm-infra 44cd openstack-helm-infra
45git checkout 8662018a4dceb82a5d699d9e118caff9e5edb156 45git checkout ef3adc4d0e5d26e74590d2f78400f7e1d800dbcb
46 46
47cd "${CURRENT_DIR}" 47cd "${CURRENT_DIR}"