From 419300b277a60f6cf6b69533a1bbfafe41e4d219 Mon Sep 17 00:00:00 2001
From: Andrii Ostapenko <andrii.ostapenko@att.com>
Date: Mon, 20 Sep 2021 13:42:06 -0600
Subject: [PATCH] Fix layout

Current inheritance model we use site -> type -> global is currently
violated inheriting in global phases from type/gating.

Also makes capd job voting.

Change-Id: I9dd6e8b9050fa37b7f38690aebf4fcae71771b80
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
---
 manifests/phases/kustomization.yaml                       | 1 -
 manifests/site/docker-test-site/phases/kustomization.yaml | 2 +-
 manifests/site/test-site/phases/kustomization.yaml        | 2 +-
 manifests/type/gating/{ => phases}/kustomization.yaml     | 1 +
 manifests/type/gating/{ => phases}/plan.yaml              | 0
 zuul.d/jobs.yaml                                          | 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename manifests/type/gating/{ => phases}/kustomization.yaml (55%)
 rename manifests/type/gating/{ => phases}/plan.yaml (100%)

diff --git a/manifests/phases/kustomization.yaml b/manifests/phases/kustomization.yaml
index 90ffb6456..7f6abb122 100644
--- a/manifests/phases/kustomization.yaml
+++ b/manifests/phases/kustomization.yaml
@@ -1,6 +1,5 @@
 resources:
   - phases.yaml
-  - ../type/gating
   - executors.yaml
   - cluster-map.yaml
   - ../function/clusterctl
diff --git a/manifests/site/docker-test-site/phases/kustomization.yaml b/manifests/site/docker-test-site/phases/kustomization.yaml
index 054fbeaa3..03bf4f247 100644
--- a/manifests/site/docker-test-site/phases/kustomization.yaml
+++ b/manifests/site/docker-test-site/phases/kustomization.yaml
@@ -1,5 +1,5 @@
 resources:
-  - ../../../phases
+  - ../../../type/gating/phases
   - ../../../function/airshipctl-base-catalogues
 patchesJson6902:
   - target:
diff --git a/manifests/site/test-site/phases/kustomization.yaml b/manifests/site/test-site/phases/kustomization.yaml
index 6bfeab610..6a8c3bb0e 100644
--- a/manifests/site/test-site/phases/kustomization.yaml
+++ b/manifests/site/test-site/phases/kustomization.yaml
@@ -1,6 +1,6 @@
 resources:
   - ../kubeconfig
-  - ../../../phases
+  - ../../../type/gating/phases
   - ../target/catalogues
   - catalogue.yaml
 transformers:
diff --git a/manifests/type/gating/kustomization.yaml b/manifests/type/gating/phases/kustomization.yaml
similarity index 55%
rename from manifests/type/gating/kustomization.yaml
rename to manifests/type/gating/phases/kustomization.yaml
index 872117462..d4d7f6671 100644
--- a/manifests/type/gating/kustomization.yaml
+++ b/manifests/type/gating/phases/kustomization.yaml
@@ -1,2 +1,3 @@
 resources:
+  - ../../../phases
   - plan.yaml
diff --git a/manifests/type/gating/plan.yaml b/manifests/type/gating/phases/plan.yaml
similarity index 100%
rename from manifests/type/gating/plan.yaml
rename to manifests/type/gating/phases/plan.yaml
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 52f201fb7..20d3e62ce 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -215,7 +215,7 @@
         - CLUSTER=ephemeral-cluster KIND_CONFIG=./tools/deployment/templates/kind-cluster-with-extramounts ./tools/deployment/kind/start_kind.sh
         - ./tools/deployment/23_pull_documents.sh
         - ./tools/deployment/25_deploy_gating.sh
-    voting: false
+    voting: true
 - job:
     name: airship-airshipctl-docker-kubebench-conformance
     attempts: 1