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>
This commit is contained in:
Andrii Ostapenko 2021-09-20 13:42:06 -06:00
parent 6cdf28fb40
commit 419300b277
No known key found for this signature in database
GPG Key ID: F3E83668DBB223B3
6 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,5 @@
resources: resources:
- phases.yaml - phases.yaml
- ../type/gating
- executors.yaml - executors.yaml
- cluster-map.yaml - cluster-map.yaml
- ../function/clusterctl - ../function/clusterctl

View File

@ -1,5 +1,5 @@
resources: resources:
- ../../../phases - ../../../type/gating/phases
- ../../../function/airshipctl-base-catalogues - ../../../function/airshipctl-base-catalogues
patchesJson6902: patchesJson6902:
- target: - target:

View File

@ -1,6 +1,6 @@
resources: resources:
- ../kubeconfig - ../kubeconfig
- ../../../phases - ../../../type/gating/phases
- ../target/catalogues - ../target/catalogues
- catalogue.yaml - catalogue.yaml
transformers: transformers:

View File

@ -1,2 +1,3 @@
resources: resources:
- ../../../phases
- plan.yaml - plan.yaml

View File

@ -215,7 +215,7 @@
- CLUSTER=ephemeral-cluster KIND_CONFIG=./tools/deployment/templates/kind-cluster-with-extramounts ./tools/deployment/kind/start_kind.sh - 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/23_pull_documents.sh
- ./tools/deployment/25_deploy_gating.sh - ./tools/deployment/25_deploy_gating.sh
voting: false voting: true
- job: - job:
name: airship-airshipctl-docker-kubebench-conformance name: airship-airshipctl-docker-kubebench-conformance
attempts: 1 attempts: 1