From b1ae6dee454543e85271eebe8c7f851120f95f1c Mon Sep 17 00:00:00 2001
From: Drew Walters <andrew.walters@att.com>
Date: Wed, 21 Aug 2019 20:43:57 +0000
Subject: [PATCH] CI: Update Airskiff full-site manifest location

The location of the Airskiff site recently changed [0], causing the
Airskiff job to fail. This change updates the "reduce site" playbook to
match the job in treasuremap, thereby avoiding the directory which no
longer exists.

The change also removes the usage of install-packages script, because
it was removed [1].

[0] https://review.opendev.org/674963
[1] https://review.opendev.org/672540

Change-Id: I7b20ff7c50cfa085039e893558df2cf022c4333c
Signed-off-by: Drew Walters <andrew.walters@att.com>
---
 tools/gate/playbooks/airskiff-deploy.yaml     | 21 +++++++------------
 .../gate/playbooks/airskiff-reduce-site.yaml  |  2 +-
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/tools/gate/playbooks/airskiff-deploy.yaml b/tools/gate/playbooks/airskiff-deploy.yaml
index 3b67e426..22a198e0 100644
--- a/tools/gate/playbooks/airskiff-deploy.yaml
+++ b/tools/gate/playbooks/airskiff-deploy.yaml
@@ -14,17 +14,16 @@
 
 - hosts: primary
   tasks:
-    - name: Install Required Packages
-      shell: |
-        ./tools/deployment/airskiff/developer/000-install-packages.sh
-      args:
-        chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
-      become: yes
-
     - name: Clone Required Repositories
       shell: |
         export CLONE_SHIPYARD={{ CLONE_SHIPYARD }}
-        ./tools/deployment/airskiff/developer/005-clone-dependencies.sh
+        ./tools/deployment/airskiff/developer/000-clone-dependencies.sh
+      args:
+        chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
+
+    - name: Deploy Kubernetes with Minikube
+      shell: |
+        ./tools/deployment/airskiff/developer/010-deploy-k8s.sh
       args:
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
 
@@ -35,12 +34,6 @@
         chdir: "{{ zuul.project.src_dir }}"
       become: yes
 
-    - name: Deploy Kubernetes with Minikube
-      shell: |
-        ./tools/deployment/airskiff/developer/010-deploy-k8s.sh
-      args:
-        chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
-
     - name: Setup OpenStack Client
       shell: |
         ./tools/deployment/airskiff/developer/020-setup-client.sh
diff --git a/tools/gate/playbooks/airskiff-reduce-site.yaml b/tools/gate/playbooks/airskiff-reduce-site.yaml
index fcf1b3f8..c0953a38 100644
--- a/tools/gate/playbooks/airskiff-reduce-site.yaml
+++ b/tools/gate/playbooks/airskiff-reduce-site.yaml
@@ -17,6 +17,6 @@
     - name: Overwrite Armada manifest
       shell: |
         mv tools/gate/manifests/full-site.yaml \
-            site/airskiff/software/manifests/full-site.yaml
+            type/skiff/manifests/full-site.yaml
       args:
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"