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

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

Change-Id: I5c07f19755731b6df678aad0c066cfe588c79a80
---
 .zuul.yaml                                |  1 +
 tools/gate/playbooks/airskiff-deploy.yaml | 26 ++++++++++-------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index d34ccc40..c39bf10a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -97,6 +97,7 @@
       - airship/treasuremap
     vars:
       CLONE_ARMADA: 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 6b895750..f20464ff 100644
--- a/tools/gate/playbooks/airskiff-deploy.yaml
+++ b/tools/gate/playbooks/airskiff-deploy.yaml
@@ -1,4 +1,4 @@
-# Copyright 2018 AT&T Intellectual Property.  All other rights reserved.
+# Copyright 2019, AT&T Intellectual Property
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,18 +14,19 @@
 
 - hosts: primary
   roles:
-    - bindep
     - clear-firewall
-    - ensure-docker
+    - bindep
+    - disable-systemd-resolved
     - ensure-python
     - ensure-pip
-    - disable-systemd-resolved
+    - ensure-docker
 
   tasks:
+
     - name: Clone Required Repositories
       shell: |
         export CLONE_ARMADA={{ CLONE_ARMADA }}
-        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 }}"
@@ -49,18 +50,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
-      args:
-        chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
-
-    - name: Use Armada focal image as bionic for tests
-      shell: |
-        set -x
-        docker tag  quay.io/airshipit/armada:latest-ubuntu_focal quay.io/airshipit/armada:latest-ubuntu_bionic
+        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: |
@@ -71,7 +67,7 @@
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
       become: yes
 
-    - name: Deploy OpenStack using Airship
+    - name: Deploy Memcached using Airship
       shell: |
         ./tools/deployment/airskiff/developer/100-deploy-osh.sh
       args: