From 826e6b7223dab21f123eacd995d153111f1f1ee3 Mon Sep 17 00:00:00 2001 From: Drew Walters Date: Thu, 22 Nov 2018 03:54:23 -0600 Subject: [PATCH] airship: Pin to known OSH-INFRA version Currently, the latest version of OpenStack-Helm-Infra is used to bootstrap a Kubernetes cluster and all required charts for the Armada bootstrap process. Any breaking change in OSH-Infra can cause inadvertent gate failures in the Airskiff gate even if the integration itself is not broken. This commit pins all references during the Airskiff setup process to known commit f915a85f2ba8ad2f59044c5b8ad733d013a12e25 to prevent inadvertent gate failures. The latest integration of OSH-infra and Airship remains tested through regular uplift patches submitted by "Jenkins Uplifter . Change-Id: If457d4f68b51aa0517c27997350f9986509df17f --- .zuul.yaml | 12 ++--- .../airskiff/developer/005-make-airship.sh | 4 +- .../airskiff/manifests/airship.yaml | 50 +++++++++++-------- 3 files changed, 39 insertions(+), 27 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 39fd1fe50..554284e0e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -44,12 +44,12 @@ run: tools/gate/playbooks/airskiff-deploy-gate.yaml post-run: tools/gate/playbooks/debug-report.yaml required-projects: - - openstack/airship-armada - - openstack/airship-deckhand - - openstack/airship-pegleg - - openstack/airship-shipyard - - openstack/openstack-helm - - openstack/openstack-helm-infra + - name: openstack/airship-armada + - name: openstack/airship-deckhand + - 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 a1a6cb003..e874d825a 100755 --- a/tools/deployment/airskiff/developer/005-make-airship.sh +++ b/tools/deployment/airskiff/developer/005-make-airship.sh @@ -39,7 +39,9 @@ cd ${INSTALL_PATH} git clone https://git.openstack.org/openstack/airship-pegleg.git # Clone dependencies -git clone https://git.openstack.org/openstack/openstack-helm.git git clone https://git.openstack.org/openstack/openstack-helm-infra.git +cd openstack-helm-infra +git checkout 8662018a4dceb82a5d699d9e118caff9e5edb156 + cd "${CURRENT_DIR}" diff --git a/tools/deployment/airskiff/manifests/airship.yaml b/tools/deployment/airskiff/manifests/airship.yaml index 452651055..c10f0fece 100644 --- a/tools/deployment/airskiff/manifests/airship.yaml +++ b/tools/deployment/airskiff/manifests/airship.yaml @@ -13,8 +13,9 @@ data: release_group: airship-helm-toolkit values: {} source: - type: local - location: /airship-components/openstack-helm-infra + type: git + location: https://git.openstack.org/openstack/openstack-helm-infra.git + reference: 8662018a4dceb82a5d699d9e118caff9e5edb156 subpath: helm-toolkit dependencies: [] --- @@ -37,8 +38,9 @@ data: network: host_namespace: True source: - type: local - location: /airship-components/openstack-helm-infra + type: git + location: https://git.openstack.org/openstack/openstack-helm-infra.git + reference: 8662018a4dceb82a5d699d9e118caff9e5edb156 subpath: ingress dependencies: - osh-helm-toolkit @@ -57,8 +59,9 @@ data: release_group: airship-ingress-ucp values: {} source: - type: local - location: /airship-components/openstack-helm-infra + type: git + location: https://git.openstack.org/openstack/openstack-helm-infra.git + reference: 8662018a4dceb82a5d699d9e118caff9e5edb156 subpath: ingress dependencies: - osh-helm-toolkit @@ -79,8 +82,9 @@ data: storageclass: name: general source: - type: local - location: /airship-components/openstack-helm-infra + type: git + location: https://git.openstack.org/openstack/openstack-helm-infra.git + reference: 8662018a4dceb82a5d699d9e118caff9e5edb156 subpath: nfs-provisioner dependencies: - osh-helm-toolkit @@ -102,8 +106,9 @@ data: replicas: server: 1 source: - type: local - location: /airship-components/openstack-helm-infra + type: git + location: https://git.openstack.org/openstack/openstack-helm-infra.git + reference: 8662018a4dceb82a5d699d9e118caff9e5edb156 subpath: mariadb dependencies: - osh-helm-toolkit @@ -127,8 +132,9 @@ data: replicas: server: 1 source: - type: local - location: /airship-components/openstack-helm-infra + type: git + location: https://git.openstack.org/openstack/openstack-helm-infra.git + reference: 8662018a4dceb82a5d699d9e118caff9e5edb156 subpath: rabbitmq dependencies: - osh-helm-toolkit @@ -147,8 +153,9 @@ data: release_group: airship-memcached values: {} source: - type: local - location: /airship-components/openstack-helm-infra + type: git + location: https://git.openstack.org/openstack/openstack-helm-infra.git + reference: 8662018a4dceb82a5d699d9e118caff9e5edb156 subpath: memcached dependencies: - osh-helm-toolkit @@ -167,8 +174,9 @@ data: release_group: airship-keystone-ucp values: {} source: - type: local - location: /airship-components/openstack-helm + type: git + location: https://git.openstack.org/openstack/openstack-helm.git + reference: 112e15b1655285194593a7afca4352ce046c7a47 subpath: keystone dependencies: - osh-helm-toolkit @@ -190,8 +198,9 @@ data: replicas: server: 1 source: - type: local - location: /airship-components/openstack-helm-infra + type: git + location: https://git.openstack.org/openstack/openstack-helm-infra.git + reference: 8662018a4dceb82a5d699d9e118caff9e5edb156 subpath: postgresql dependencies: - osh-helm-toolkit @@ -210,8 +219,9 @@ data: release_group: airship-barbican values: {} source: - type: local - location: /airship-components/openstack-helm + type: git + location: https://git.openstack.org/openstack/openstack-helm.git + reference: 112e15b1655285194593a7afca4352ce046c7a47 subpath: barbican dependencies: - osh-helm-toolkit