From e4cf0c17df103683b971b07f6b29d58f1ae681c0 Mon Sep 17 00:00:00 2001
From: Sergiy Markin <smarkin@mirantis.com>
Date: Tue, 9 May 2023 14:12:56 +0000
Subject: [PATCH] Update airskiff deployment gate

This PS updates armada to use new reliable airskiff site manifests for
testing armada.

Change-Id: Ia71077536f1973b0179d9011fa662f0b74caa6cf
---
 .zuul.yaml                                | 1 +
 tools/gate/playbooks/airskiff-deploy.yaml | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 675ac1da..a1ca506a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -217,6 +217,7 @@
       - airship/treasuremap
     vars:
       CLONE_DECKHAND: false
+      OSH_INFRA_COMMIT: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
diff --git a/tools/gate/playbooks/airskiff-deploy.yaml b/tools/gate/playbooks/airskiff-deploy.yaml
index 6634bd18..91171c59 100644
--- a/tools/gate/playbooks/airskiff-deploy.yaml
+++ b/tools/gate/playbooks/airskiff-deploy.yaml
@@ -20,10 +20,11 @@
     - install-test-requirements
 
   tasks:
+
     - name: Clone Required Repositories
       shell: |
         export CLONE_DECKHAND={{ CLONE_DECKHAND }}
-        export OSH_INFRA_COMMIT=master
+        export OSH_INFRA_COMMIT={{ OSH_INFRA_COMMIT }}
         ./tools/deployment/airskiff/developer/000-clone-dependencies.sh
       args:
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
@@ -47,11 +48,13 @@
         chdir: "{{ zuul.project.src_dir }}"
       become: yes
 
-    - name: Setup clients
+    - name: Build all charts locally
       shell: |
-        ./tools/deployment/airskiff/developer/020-setup-client.sh
+        set -ex
+        ./tools/deployment/airskiff/developer/015-make-all-charts.sh
       args:
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
+      become: yes
 
     - name: Deploy Airship components using Armada
       shell: |