From 27d31a22f786834f5d12d5322c21cff65f9dd496 Mon Sep 17 00:00:00 2001
From: "siraj.yasin" <sirajudeen.yasin@gmail.com>
Date: Mon, 1 Mar 2021 16:02:05 +0000
Subject: [PATCH] Pinning airshipctl version in treasuremap

* Treasuremap is dependant on airshipctl repo. So pinning the last
  good tested version of airshipctl in treasuremap

Change-Id: I6923da9871b946134fbdc285c38bcb8f967aa804
Relates-To: #100
---
 playbooks/airship-treasuremap-build-gate.yaml  | 9 +++++----
 playbooks/airship-treasuremap-gate-runner.yaml | 1 +
 tools/deployment/22_test_configs.sh            | 4 ++--
 tools/validate_docs                            | 2 +-
 zuul.d/jobs.yaml                               | 1 +
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/playbooks/airship-treasuremap-build-gate.yaml b/playbooks/airship-treasuremap-build-gate.yaml
index cbf17cf77..4e9624da4 100644
--- a/playbooks/airship-treasuremap-build-gate.yaml
+++ b/playbooks/airship-treasuremap-build-gate.yaml
@@ -57,7 +57,7 @@
             state: absent
           when: remote_work_dir is defined
         - name: clone document model
-          command: git clone -q {{ airship_config_primary_repo_url }} {{ remote_work_dir }}
+          command: git clone -q {{ airship_config_phase_repo_url }} {{ remote_work_dir }}
           when: remote_work_dir is defined
     - name: get VM config(MACs and bootMode) from BareMetalHost objects
       include_tasks:
@@ -87,15 +87,16 @@
             disk_format: qcow2
             ephemeral_disk_size: 20G
             ephemeral_vm_cfg: "{{ ephemeral_vm_cfg }}"
-            ephemeral_vm_memory_mb: 6124
+            ephemeral_vm_memory_mb: 6144
             ephemeral_vm_vcpus: 4
             target_disk_size: 20G
             target_vm_cfg: "{{ target_vm_cfg }}"
-            target_vm_memory_mb: 6124
+            target_vm_memory_mb: 7168
             target_vm_vcpus: 2
             target_vms_count: 1
             worker_disk_size: 20G
-            worker_vm_memory_mb: 6124
+            worker_vm_cfg: "{{ worker_vm_cfg }}"
+            worker_vm_memory_mb: 7168
             worker_vm_vcpus: 2
             worker_vms_count: 1
         airship_gate_file_exchanger:
diff --git a/playbooks/airship-treasuremap-gate-runner.yaml b/playbooks/airship-treasuremap-gate-runner.yaml
index 11342119b..4c89d27d6 100644
--- a/playbooks/airship-treasuremap-gate-runner.yaml
+++ b/playbooks/airship-treasuremap-gate-runner.yaml
@@ -16,6 +16,7 @@
   environment:
     SOPS_IMPORT_PGP: "{{ airship_config_pgp }}"
     SOPS_PGP_FP: "{{ airship_config_pgp_fp }}"
+    AIRSHIPCTL_REF: "681f8547c989e862d155f2e9f2c794c89326d931"
   tasks:
     - name: "set default gate scripts"
       set_fact:
diff --git a/tools/deployment/22_test_configs.sh b/tools/deployment/22_test_configs.sh
index 112c3b1cb..bfb58e274 100755
--- a/tools/deployment/22_test_configs.sh
+++ b/tools/deployment/22_test_configs.sh
@@ -21,7 +21,7 @@ export AIRSHIP_SITE_NAME=${AIRSHIP_SITE_NAME:-"test-site"}
 export AIRSHIP_CONFIG_METADATA_PATH=${AIRSHIP_CONFIG_METADATA_PATH:-"treasuremap/manifests/site/$AIRSHIP_SITE_NAME/metadata.yaml"}
 
 # Primary repo options
-export AIRSHIP_CONFIG_PRIMARY_REPO_URL=${AIRSHIP_CONFIG_PRIMARY_REPO_URL:-"${TREASUREMAP_PROJECT}"}
+export AIRSHIP_CONFIG_PHASE_REPO_URL=${AIRSHIP_CONFIG_PHASE_REPO_URL:-"${TREASUREMAP_PROJECT}"}
 export AIRSHIPCTL_REPO_URL=${AIRSHIPCTL_REPO_URL:-"https://opendev.org/airship/airshipctl.git"}
 export TREASUREMAP_REF=${TREASUREMAP_REF:-"$(git rev-parse HEAD)"}
 
@@ -40,7 +40,7 @@ airshipctl config set-manifest treasuremap_ci \
 
 airshipctl config set-manifest treasuremap_ci \
         --repo primary \
-        --url "${AIRSHIP_CONFIG_PRIMARY_REPO_URL}" \
+        --url "${AIRSHIP_CONFIG_PHASE_REPO_URL}" \
         --commithash "${TREASUREMAP_REF}"
 
 airshipctl config set-context ephemeral-cluster --manifest treasuremap_ci
diff --git a/tools/validate_docs b/tools/validate_docs
index a6903ec22..b23f9f73d 100755
--- a/tools/validate_docs
+++ b/tools/validate_docs
@@ -17,7 +17,7 @@
 set -xe
 
 : ${AIRSHIPCTL_PROJECT:="../airshipctl"}
-: ${MANIFEST_ROOT:="$(dirname "${PWD}")"}
+: ${MANIFEST_ROOT:="/tmp/default"}
 : ${SITE_ROOTS:="$(basename "${PWD}")/manifests/site"}
 : ${MANIFEST_REPO_URL:="https://review.opendev.org/airship/treasuremap"}
 export MANIFEST_ROOT=$MANIFEST_ROOT
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 99f37640e..d34dce05d 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -35,6 +35,7 @@
         - ./tools/deployment/01_install_kubectl.sh
         - ./tools/deployment/21_systemwide_executable.sh
         - ./tools/deployment/22_test_configs.sh
+        - ./tools/deployment/23_pull_documents.sh
         - ./tools/validate_docs
 
 - job: