From 0150d774d3734ef72aa21b1f6ccfcd111c0ef7d5 Mon Sep 17 00:00:00 2001 From: Sirajudeen Date: Wed, 9 Jun 2021 16:15:46 +0000 Subject: [PATCH] Rename Virtual Sites in Treasuremap * Renamed test-site to virtual-airship-core Relates-To: #154 Change-Id: I15905a5be8628b35f1cebcba95e3257f541d4e74 --- manifests/function/dex-aio/dex-helmrelease.yaml | 2 +- .../function/dex-aio/replacements/update-dex.yaml | 2 +- .../reference-airship-core/target/encrypted/README.md | 2 +- .../reference-multi-tenant/target/encrypted/README.md | 2 +- manifests/site/test-site/metadata.yaml | 11 ----------- .../ephemeral/bootstrap/baremetalhost.yaml | 0 .../bootstrap/hostgenerator/host-generation.yaml | 0 .../bootstrap/hostgenerator/kustomization.yaml | 0 .../ephemeral/bootstrap/kustomization.yaml | 0 .../ephemeral/bootstrap/namespace.yaml | 0 .../ephemeral/catalogues/README.md | 0 .../ephemeral/catalogues/kustomization.yaml | 0 .../ephemeral/catalogues/networking.yaml | 0 .../controlplane/hostgenerator/host-generation.yaml | 0 .../controlplane/hostgenerator/kustomization.yaml | 0 .../ephemeral/controlplane/kustomization.yaml | 0 .../ephemeral/controlplane/nodes/kustomization.yaml | 0 .../ephemeral/initinfra-networking/kustomization.yaml | 0 .../ephemeral/initinfra/kustomization.yaml | 0 .../host-inventory/hostgenerator/host-generation.yaml | 0 .../host-inventory/hostgenerator/kustomization.yaml | 0 .../host-inventory/kustomization.yaml | 0 .../kubeconfig/kubeconfig.yaml | 0 .../kubeconfig/kustomization.yaml | 0 .../kubeconfig/update-target.yaml | 0 manifests/site/virtual-airship-core/metadata.yaml | 11 +++++++++++ .../phases/kustomization.yaml | 0 .../phases/phase-patch.yaml | 0 .../target/catalogues/README.md | 0 .../target/catalogues/hosts.yaml | 0 .../target/catalogues/kustomization.yaml | 0 .../target/catalogues/networking-ha.yaml | 0 .../target/catalogues/networking.yaml | 0 .../target/catalogues/storage.yaml | 0 .../target/catalogues/versions-airshipctl.yaml | 0 .../target/encrypted/README.md | 2 +- .../target/encrypted/generator/kustomization.yaml | 0 .../target/encrypted/importer/kustomization.yaml | 0 .../encrypted/results/generated/kustomization.yaml | 0 .../target/encrypted/results/generated/secrets.yaml | 0 .../encrypted/results/imported/kustomization.yaml | 0 .../target/encrypted/results/imported/secrets.yaml | 0 .../target/encrypted/results/kustomization.yaml | 0 .../target/initinfra-networking/kustomization.yaml | 0 .../target/initinfra-networking/namespace.yaml | 0 .../target/initinfra/kustomization.yaml | 0 .../target/lma-configs/kustomization.yaml | 0 .../target/lma-infra/kustomization.yaml | 0 .../target/lma-infra/lma-infra-object-store.yaml | 0 .../target/lma-stack/kustomization.yaml | 0 .../target/lma-stack/minio-admin-secret.yaml | 0 .../target/lma-stack/patches/minio.yaml | 0 .../target/network-policies/README.md | 0 .../network-policies/calico_failsafe_rules_patch.yaml | 0 .../target/network-policies/kustomization.yaml | 0 .../target/workers/hostgenerator/host-generation.yaml | 0 .../target/workers/hostgenerator/kustomization.yaml | 0 .../target/workers/kustomization.yaml | 0 .../target/workers/nodes/kustomization.yaml | 0 .../target/workload-config/kustomization.yaml | 0 .../target/workload/kustomization.yaml | 4 ++-- .../target/workload/patch-delete-storage-cluster.yaml | 0 .../workload/patch-deploy-false-storage-cluster.yaml | 0 .../target/workload/replacements/ceph-nodes.yaml | 0 .../target/workload/replacements/kustomization.yaml | 0 .../virtual-network-cloud/target/encrypted/README.md | 2 +- .../target/workload/kustomization.yaml | 4 ++-- playbooks/vars/test-config.yaml | 2 +- tools/deployment/common/22_test_configs.sh | 2 +- tools/deployment/common/23_generate_secrets.sh | 2 +- zuul.d/jobs.yaml | 8 ++++---- zuul.d/projects.yaml | 4 ++-- 72 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 manifests/site/test-site/metadata.yaml rename manifests/site/{test-site => virtual-airship-core}/ephemeral/bootstrap/baremetalhost.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/ephemeral/bootstrap/hostgenerator/host-generation.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/ephemeral/bootstrap/hostgenerator/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/ephemeral/bootstrap/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/ephemeral/bootstrap/namespace.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/ephemeral/catalogues/README.md (100%) rename manifests/site/{test-site => virtual-airship-core}/ephemeral/catalogues/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/ephemeral/catalogues/networking.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/ephemeral/controlplane/hostgenerator/host-generation.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/ephemeral/controlplane/hostgenerator/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/ephemeral/controlplane/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/ephemeral/controlplane/nodes/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/ephemeral/initinfra-networking/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/ephemeral/initinfra/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/host-inventory/hostgenerator/host-generation.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/host-inventory/hostgenerator/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/host-inventory/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/kubeconfig/kubeconfig.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/kubeconfig/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/kubeconfig/update-target.yaml (100%) create mode 100644 manifests/site/virtual-airship-core/metadata.yaml rename manifests/site/{test-site => virtual-airship-core}/phases/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/phases/phase-patch.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/catalogues/README.md (100%) rename manifests/site/{test-site => virtual-airship-core}/target/catalogues/hosts.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/catalogues/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/catalogues/networking-ha.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/catalogues/networking.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/catalogues/storage.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/catalogues/versions-airshipctl.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/encrypted/README.md (96%) rename manifests/site/{test-site => virtual-airship-core}/target/encrypted/generator/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/encrypted/importer/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/encrypted/results/generated/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/encrypted/results/generated/secrets.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/encrypted/results/imported/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/encrypted/results/imported/secrets.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/encrypted/results/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/initinfra-networking/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/initinfra-networking/namespace.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/initinfra/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/lma-configs/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/lma-infra/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/lma-infra/lma-infra-object-store.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/lma-stack/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/lma-stack/minio-admin-secret.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/lma-stack/patches/minio.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/network-policies/README.md (100%) rename manifests/site/{test-site => virtual-airship-core}/target/network-policies/calico_failsafe_rules_patch.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/network-policies/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/workers/hostgenerator/host-generation.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/workers/hostgenerator/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/workers/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/workers/nodes/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/workload-config/kustomization.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/workload/kustomization.yaml (74%) rename manifests/site/{test-site => virtual-airship-core}/target/workload/patch-delete-storage-cluster.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/workload/patch-deploy-false-storage-cluster.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/workload/replacements/ceph-nodes.yaml (100%) rename manifests/site/{test-site => virtual-airship-core}/target/workload/replacements/kustomization.yaml (100%) diff --git a/manifests/function/dex-aio/dex-helmrelease.yaml b/manifests/function/dex-aio/dex-helmrelease.yaml index 42d0f0779..16857c9ce 100644 --- a/manifests/function/dex-aio/dex-helmrelease.yaml +++ b/manifests/function/dex-aio/dex-helmrelease.yaml @@ -51,7 +51,7 @@ spec: value: "" params: site: - name: dex-test-site + name: dex-virtual-airship-core endpoints: hostname: dex.function.local port: diff --git a/manifests/function/dex-aio/replacements/update-dex.yaml b/manifests/function/dex-aio/replacements/update-dex.yaml index 36894d1db..d1d941dd6 100644 --- a/manifests/function/dex-aio/replacements/update-dex.yaml +++ b/manifests/function/dex-aio/replacements/update-dex.yaml @@ -29,7 +29,7 @@ replacements: fieldrefs: ["{.spec.values.params.ldap.bind_password}"] ### DEX - API SERVER/OIDC INTEGRATION ### -# Dex sitename, e.g., dex-test-site +# Dex sitename, e.g., dex-virtual-airship-core - source: objref: kind: VariableCatalogue diff --git a/manifests/site/reference-airship-core/target/encrypted/README.md b/manifests/site/reference-airship-core/target/encrypted/README.md index 633ba6e85..e662546a9 100644 --- a/manifests/site/reference-airship-core/target/encrypted/README.md +++ b/manifests/site/reference-airship-core/target/encrypted/README.md @@ -29,4 +29,4 @@ This container encrypt the secrets and write it to directory specified in `kusto To decrypt previously encrypted secrets we use [decrypt-secrets.yaml](results/decrypt-secrets.yaml). It will run the decrypt sops function when we run `KUSTOMIZE_PLUGIN_HOME=$(pwd)/manifests SOPS_IMPORT_PGP=$(cat key.asc) kustomize build --enable_alpha_plugins -manifests/site/test-site/target/catalogues/` +manifests/site/virtual-airship-core/target/catalogues/` diff --git a/manifests/site/reference-multi-tenant/target/encrypted/README.md b/manifests/site/reference-multi-tenant/target/encrypted/README.md index 633ba6e85..e662546a9 100644 --- a/manifests/site/reference-multi-tenant/target/encrypted/README.md +++ b/manifests/site/reference-multi-tenant/target/encrypted/README.md @@ -29,4 +29,4 @@ This container encrypt the secrets and write it to directory specified in `kusto To decrypt previously encrypted secrets we use [decrypt-secrets.yaml](results/decrypt-secrets.yaml). It will run the decrypt sops function when we run `KUSTOMIZE_PLUGIN_HOME=$(pwd)/manifests SOPS_IMPORT_PGP=$(cat key.asc) kustomize build --enable_alpha_plugins -manifests/site/test-site/target/catalogues/` +manifests/site/virtual-airship-core/target/catalogues/` diff --git a/manifests/site/test-site/metadata.yaml b/manifests/site/test-site/metadata.yaml deleted file mode 100644 index 118963dc1..000000000 --- a/manifests/site/test-site/metadata.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: airshipit.org/v1alpha1 -kind: ManifestMetadata -metadata: - name: manifest-metadata -spec: - phase: - docEntryPointPrefix: manifests/site/test-site - path: manifests/site/test-site/phases - - inventory: - path: manifests/site/test-site/host-inventory diff --git a/manifests/site/test-site/ephemeral/bootstrap/baremetalhost.yaml b/manifests/site/virtual-airship-core/ephemeral/bootstrap/baremetalhost.yaml similarity index 100% rename from manifests/site/test-site/ephemeral/bootstrap/baremetalhost.yaml rename to manifests/site/virtual-airship-core/ephemeral/bootstrap/baremetalhost.yaml diff --git a/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/host-generation.yaml b/manifests/site/virtual-airship-core/ephemeral/bootstrap/hostgenerator/host-generation.yaml similarity index 100% rename from manifests/site/test-site/ephemeral/bootstrap/hostgenerator/host-generation.yaml rename to manifests/site/virtual-airship-core/ephemeral/bootstrap/hostgenerator/host-generation.yaml diff --git a/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml b/manifests/site/virtual-airship-core/ephemeral/bootstrap/hostgenerator/kustomization.yaml similarity index 100% rename from manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml rename to manifests/site/virtual-airship-core/ephemeral/bootstrap/hostgenerator/kustomization.yaml diff --git a/manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml b/manifests/site/virtual-airship-core/ephemeral/bootstrap/kustomization.yaml similarity index 100% rename from manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml rename to manifests/site/virtual-airship-core/ephemeral/bootstrap/kustomization.yaml diff --git a/manifests/site/test-site/ephemeral/bootstrap/namespace.yaml b/manifests/site/virtual-airship-core/ephemeral/bootstrap/namespace.yaml similarity index 100% rename from manifests/site/test-site/ephemeral/bootstrap/namespace.yaml rename to manifests/site/virtual-airship-core/ephemeral/bootstrap/namespace.yaml diff --git a/manifests/site/test-site/ephemeral/catalogues/README.md b/manifests/site/virtual-airship-core/ephemeral/catalogues/README.md similarity index 100% rename from manifests/site/test-site/ephemeral/catalogues/README.md rename to manifests/site/virtual-airship-core/ephemeral/catalogues/README.md diff --git a/manifests/site/test-site/ephemeral/catalogues/kustomization.yaml b/manifests/site/virtual-airship-core/ephemeral/catalogues/kustomization.yaml similarity index 100% rename from manifests/site/test-site/ephemeral/catalogues/kustomization.yaml rename to manifests/site/virtual-airship-core/ephemeral/catalogues/kustomization.yaml diff --git a/manifests/site/test-site/ephemeral/catalogues/networking.yaml b/manifests/site/virtual-airship-core/ephemeral/catalogues/networking.yaml similarity index 100% rename from manifests/site/test-site/ephemeral/catalogues/networking.yaml rename to manifests/site/virtual-airship-core/ephemeral/catalogues/networking.yaml diff --git a/manifests/site/test-site/ephemeral/controlplane/hostgenerator/host-generation.yaml b/manifests/site/virtual-airship-core/ephemeral/controlplane/hostgenerator/host-generation.yaml similarity index 100% rename from manifests/site/test-site/ephemeral/controlplane/hostgenerator/host-generation.yaml rename to manifests/site/virtual-airship-core/ephemeral/controlplane/hostgenerator/host-generation.yaml diff --git a/manifests/site/test-site/ephemeral/controlplane/hostgenerator/kustomization.yaml b/manifests/site/virtual-airship-core/ephemeral/controlplane/hostgenerator/kustomization.yaml similarity index 100% rename from manifests/site/test-site/ephemeral/controlplane/hostgenerator/kustomization.yaml rename to manifests/site/virtual-airship-core/ephemeral/controlplane/hostgenerator/kustomization.yaml diff --git a/manifests/site/test-site/ephemeral/controlplane/kustomization.yaml b/manifests/site/virtual-airship-core/ephemeral/controlplane/kustomization.yaml similarity index 100% rename from manifests/site/test-site/ephemeral/controlplane/kustomization.yaml rename to manifests/site/virtual-airship-core/ephemeral/controlplane/kustomization.yaml diff --git a/manifests/site/test-site/ephemeral/controlplane/nodes/kustomization.yaml b/manifests/site/virtual-airship-core/ephemeral/controlplane/nodes/kustomization.yaml similarity index 100% rename from manifests/site/test-site/ephemeral/controlplane/nodes/kustomization.yaml rename to manifests/site/virtual-airship-core/ephemeral/controlplane/nodes/kustomization.yaml diff --git a/manifests/site/test-site/ephemeral/initinfra-networking/kustomization.yaml b/manifests/site/virtual-airship-core/ephemeral/initinfra-networking/kustomization.yaml similarity index 100% rename from manifests/site/test-site/ephemeral/initinfra-networking/kustomization.yaml rename to manifests/site/virtual-airship-core/ephemeral/initinfra-networking/kustomization.yaml diff --git a/manifests/site/test-site/ephemeral/initinfra/kustomization.yaml b/manifests/site/virtual-airship-core/ephemeral/initinfra/kustomization.yaml similarity index 100% rename from manifests/site/test-site/ephemeral/initinfra/kustomization.yaml rename to manifests/site/virtual-airship-core/ephemeral/initinfra/kustomization.yaml diff --git a/manifests/site/test-site/host-inventory/hostgenerator/host-generation.yaml b/manifests/site/virtual-airship-core/host-inventory/hostgenerator/host-generation.yaml similarity index 100% rename from manifests/site/test-site/host-inventory/hostgenerator/host-generation.yaml rename to manifests/site/virtual-airship-core/host-inventory/hostgenerator/host-generation.yaml diff --git a/manifests/site/test-site/host-inventory/hostgenerator/kustomization.yaml b/manifests/site/virtual-airship-core/host-inventory/hostgenerator/kustomization.yaml similarity index 100% rename from manifests/site/test-site/host-inventory/hostgenerator/kustomization.yaml rename to manifests/site/virtual-airship-core/host-inventory/hostgenerator/kustomization.yaml diff --git a/manifests/site/test-site/host-inventory/kustomization.yaml b/manifests/site/virtual-airship-core/host-inventory/kustomization.yaml similarity index 100% rename from manifests/site/test-site/host-inventory/kustomization.yaml rename to manifests/site/virtual-airship-core/host-inventory/kustomization.yaml diff --git a/manifests/site/test-site/kubeconfig/kubeconfig.yaml b/manifests/site/virtual-airship-core/kubeconfig/kubeconfig.yaml similarity index 100% rename from manifests/site/test-site/kubeconfig/kubeconfig.yaml rename to manifests/site/virtual-airship-core/kubeconfig/kubeconfig.yaml diff --git a/manifests/site/test-site/kubeconfig/kustomization.yaml b/manifests/site/virtual-airship-core/kubeconfig/kustomization.yaml similarity index 100% rename from manifests/site/test-site/kubeconfig/kustomization.yaml rename to manifests/site/virtual-airship-core/kubeconfig/kustomization.yaml diff --git a/manifests/site/test-site/kubeconfig/update-target.yaml b/manifests/site/virtual-airship-core/kubeconfig/update-target.yaml similarity index 100% rename from manifests/site/test-site/kubeconfig/update-target.yaml rename to manifests/site/virtual-airship-core/kubeconfig/update-target.yaml diff --git a/manifests/site/virtual-airship-core/metadata.yaml b/manifests/site/virtual-airship-core/metadata.yaml new file mode 100644 index 000000000..2b1763282 --- /dev/null +++ b/manifests/site/virtual-airship-core/metadata.yaml @@ -0,0 +1,11 @@ +apiVersion: airshipit.org/v1alpha1 +kind: ManifestMetadata +metadata: + name: manifest-metadata +spec: + phase: + docEntryPointPrefix: manifests/site/virtual-airship-core + path: manifests/site/virtual-airship-core/phases + + inventory: + path: manifests/site/virtual-airship-core/host-inventory diff --git a/manifests/site/test-site/phases/kustomization.yaml b/manifests/site/virtual-airship-core/phases/kustomization.yaml similarity index 100% rename from manifests/site/test-site/phases/kustomization.yaml rename to manifests/site/virtual-airship-core/phases/kustomization.yaml diff --git a/manifests/site/test-site/phases/phase-patch.yaml b/manifests/site/virtual-airship-core/phases/phase-patch.yaml similarity index 100% rename from manifests/site/test-site/phases/phase-patch.yaml rename to manifests/site/virtual-airship-core/phases/phase-patch.yaml diff --git a/manifests/site/test-site/target/catalogues/README.md b/manifests/site/virtual-airship-core/target/catalogues/README.md similarity index 100% rename from manifests/site/test-site/target/catalogues/README.md rename to manifests/site/virtual-airship-core/target/catalogues/README.md diff --git a/manifests/site/test-site/target/catalogues/hosts.yaml b/manifests/site/virtual-airship-core/target/catalogues/hosts.yaml similarity index 100% rename from manifests/site/test-site/target/catalogues/hosts.yaml rename to manifests/site/virtual-airship-core/target/catalogues/hosts.yaml diff --git a/manifests/site/test-site/target/catalogues/kustomization.yaml b/manifests/site/virtual-airship-core/target/catalogues/kustomization.yaml similarity index 100% rename from manifests/site/test-site/target/catalogues/kustomization.yaml rename to manifests/site/virtual-airship-core/target/catalogues/kustomization.yaml diff --git a/manifests/site/test-site/target/catalogues/networking-ha.yaml b/manifests/site/virtual-airship-core/target/catalogues/networking-ha.yaml similarity index 100% rename from manifests/site/test-site/target/catalogues/networking-ha.yaml rename to manifests/site/virtual-airship-core/target/catalogues/networking-ha.yaml diff --git a/manifests/site/test-site/target/catalogues/networking.yaml b/manifests/site/virtual-airship-core/target/catalogues/networking.yaml similarity index 100% rename from manifests/site/test-site/target/catalogues/networking.yaml rename to manifests/site/virtual-airship-core/target/catalogues/networking.yaml diff --git a/manifests/site/test-site/target/catalogues/storage.yaml b/manifests/site/virtual-airship-core/target/catalogues/storage.yaml similarity index 100% rename from manifests/site/test-site/target/catalogues/storage.yaml rename to manifests/site/virtual-airship-core/target/catalogues/storage.yaml diff --git a/manifests/site/test-site/target/catalogues/versions-airshipctl.yaml b/manifests/site/virtual-airship-core/target/catalogues/versions-airshipctl.yaml similarity index 100% rename from manifests/site/test-site/target/catalogues/versions-airshipctl.yaml rename to manifests/site/virtual-airship-core/target/catalogues/versions-airshipctl.yaml diff --git a/manifests/site/test-site/target/encrypted/README.md b/manifests/site/virtual-airship-core/target/encrypted/README.md similarity index 96% rename from manifests/site/test-site/target/encrypted/README.md rename to manifests/site/virtual-airship-core/target/encrypted/README.md index 633ba6e85..e662546a9 100644 --- a/manifests/site/test-site/target/encrypted/README.md +++ b/manifests/site/virtual-airship-core/target/encrypted/README.md @@ -29,4 +29,4 @@ This container encrypt the secrets and write it to directory specified in `kusto To decrypt previously encrypted secrets we use [decrypt-secrets.yaml](results/decrypt-secrets.yaml). It will run the decrypt sops function when we run `KUSTOMIZE_PLUGIN_HOME=$(pwd)/manifests SOPS_IMPORT_PGP=$(cat key.asc) kustomize build --enable_alpha_plugins -manifests/site/test-site/target/catalogues/` +manifests/site/virtual-airship-core/target/catalogues/` diff --git a/manifests/site/test-site/target/encrypted/generator/kustomization.yaml b/manifests/site/virtual-airship-core/target/encrypted/generator/kustomization.yaml similarity index 100% rename from manifests/site/test-site/target/encrypted/generator/kustomization.yaml rename to manifests/site/virtual-airship-core/target/encrypted/generator/kustomization.yaml diff --git a/manifests/site/test-site/target/encrypted/importer/kustomization.yaml b/manifests/site/virtual-airship-core/target/encrypted/importer/kustomization.yaml similarity index 100% rename from manifests/site/test-site/target/encrypted/importer/kustomization.yaml rename to manifests/site/virtual-airship-core/target/encrypted/importer/kustomization.yaml diff --git a/manifests/site/test-site/target/encrypted/results/generated/kustomization.yaml b/manifests/site/virtual-airship-core/target/encrypted/results/generated/kustomization.yaml similarity index 100% rename from manifests/site/test-site/target/encrypted/results/generated/kustomization.yaml rename to manifests/site/virtual-airship-core/target/encrypted/results/generated/kustomization.yaml diff --git a/manifests/site/test-site/target/encrypted/results/generated/secrets.yaml b/manifests/site/virtual-airship-core/target/encrypted/results/generated/secrets.yaml similarity index 100% rename from manifests/site/test-site/target/encrypted/results/generated/secrets.yaml rename to manifests/site/virtual-airship-core/target/encrypted/results/generated/secrets.yaml diff --git a/manifests/site/test-site/target/encrypted/results/imported/kustomization.yaml b/manifests/site/virtual-airship-core/target/encrypted/results/imported/kustomization.yaml similarity index 100% rename from manifests/site/test-site/target/encrypted/results/imported/kustomization.yaml rename to manifests/site/virtual-airship-core/target/encrypted/results/imported/kustomization.yaml diff --git a/manifests/site/test-site/target/encrypted/results/imported/secrets.yaml b/manifests/site/virtual-airship-core/target/encrypted/results/imported/secrets.yaml similarity index 100% rename from manifests/site/test-site/target/encrypted/results/imported/secrets.yaml rename to manifests/site/virtual-airship-core/target/encrypted/results/imported/secrets.yaml diff --git a/manifests/site/test-site/target/encrypted/results/kustomization.yaml b/manifests/site/virtual-airship-core/target/encrypted/results/kustomization.yaml similarity index 100% rename from manifests/site/test-site/target/encrypted/results/kustomization.yaml rename to manifests/site/virtual-airship-core/target/encrypted/results/kustomization.yaml diff --git a/manifests/site/test-site/target/initinfra-networking/kustomization.yaml b/manifests/site/virtual-airship-core/target/initinfra-networking/kustomization.yaml similarity index 100% rename from manifests/site/test-site/target/initinfra-networking/kustomization.yaml rename to manifests/site/virtual-airship-core/target/initinfra-networking/kustomization.yaml diff --git a/manifests/site/test-site/target/initinfra-networking/namespace.yaml b/manifests/site/virtual-airship-core/target/initinfra-networking/namespace.yaml similarity index 100% rename from manifests/site/test-site/target/initinfra-networking/namespace.yaml rename to manifests/site/virtual-airship-core/target/initinfra-networking/namespace.yaml diff --git a/manifests/site/test-site/target/initinfra/kustomization.yaml b/manifests/site/virtual-airship-core/target/initinfra/kustomization.yaml similarity index 100% rename from manifests/site/test-site/target/initinfra/kustomization.yaml rename to manifests/site/virtual-airship-core/target/initinfra/kustomization.yaml diff --git a/manifests/site/test-site/target/lma-configs/kustomization.yaml b/manifests/site/virtual-airship-core/target/lma-configs/kustomization.yaml similarity index 100% rename from manifests/site/test-site/target/lma-configs/kustomization.yaml rename to manifests/site/virtual-airship-core/target/lma-configs/kustomization.yaml diff --git a/manifests/site/test-site/target/lma-infra/kustomization.yaml b/manifests/site/virtual-airship-core/target/lma-infra/kustomization.yaml similarity index 100% rename from manifests/site/test-site/target/lma-infra/kustomization.yaml rename to manifests/site/virtual-airship-core/target/lma-infra/kustomization.yaml diff --git a/manifests/site/test-site/target/lma-infra/lma-infra-object-store.yaml b/manifests/site/virtual-airship-core/target/lma-infra/lma-infra-object-store.yaml similarity index 100% rename from manifests/site/test-site/target/lma-infra/lma-infra-object-store.yaml rename to manifests/site/virtual-airship-core/target/lma-infra/lma-infra-object-store.yaml diff --git a/manifests/site/test-site/target/lma-stack/kustomization.yaml b/manifests/site/virtual-airship-core/target/lma-stack/kustomization.yaml similarity index 100% rename from manifests/site/test-site/target/lma-stack/kustomization.yaml rename to manifests/site/virtual-airship-core/target/lma-stack/kustomization.yaml diff --git a/manifests/site/test-site/target/lma-stack/minio-admin-secret.yaml b/manifests/site/virtual-airship-core/target/lma-stack/minio-admin-secret.yaml similarity index 100% rename from manifests/site/test-site/target/lma-stack/minio-admin-secret.yaml rename to manifests/site/virtual-airship-core/target/lma-stack/minio-admin-secret.yaml diff --git a/manifests/site/test-site/target/lma-stack/patches/minio.yaml b/manifests/site/virtual-airship-core/target/lma-stack/patches/minio.yaml similarity index 100% rename from manifests/site/test-site/target/lma-stack/patches/minio.yaml rename to manifests/site/virtual-airship-core/target/lma-stack/patches/minio.yaml diff --git a/manifests/site/test-site/target/network-policies/README.md b/manifests/site/virtual-airship-core/target/network-policies/README.md similarity index 100% rename from manifests/site/test-site/target/network-policies/README.md rename to manifests/site/virtual-airship-core/target/network-policies/README.md diff --git a/manifests/site/test-site/target/network-policies/calico_failsafe_rules_patch.yaml b/manifests/site/virtual-airship-core/target/network-policies/calico_failsafe_rules_patch.yaml similarity index 100% rename from manifests/site/test-site/target/network-policies/calico_failsafe_rules_patch.yaml rename to manifests/site/virtual-airship-core/target/network-policies/calico_failsafe_rules_patch.yaml diff --git a/manifests/site/test-site/target/network-policies/kustomization.yaml b/manifests/site/virtual-airship-core/target/network-policies/kustomization.yaml similarity index 100% rename from manifests/site/test-site/target/network-policies/kustomization.yaml rename to manifests/site/virtual-airship-core/target/network-policies/kustomization.yaml diff --git a/manifests/site/test-site/target/workers/hostgenerator/host-generation.yaml b/manifests/site/virtual-airship-core/target/workers/hostgenerator/host-generation.yaml similarity index 100% rename from manifests/site/test-site/target/workers/hostgenerator/host-generation.yaml rename to manifests/site/virtual-airship-core/target/workers/hostgenerator/host-generation.yaml diff --git a/manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml b/manifests/site/virtual-airship-core/target/workers/hostgenerator/kustomization.yaml similarity index 100% rename from manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml rename to manifests/site/virtual-airship-core/target/workers/hostgenerator/kustomization.yaml diff --git a/manifests/site/test-site/target/workers/kustomization.yaml b/manifests/site/virtual-airship-core/target/workers/kustomization.yaml similarity index 100% rename from manifests/site/test-site/target/workers/kustomization.yaml rename to manifests/site/virtual-airship-core/target/workers/kustomization.yaml diff --git a/manifests/site/test-site/target/workers/nodes/kustomization.yaml b/manifests/site/virtual-airship-core/target/workers/nodes/kustomization.yaml similarity index 100% rename from manifests/site/test-site/target/workers/nodes/kustomization.yaml rename to manifests/site/virtual-airship-core/target/workers/nodes/kustomization.yaml diff --git a/manifests/site/test-site/target/workload-config/kustomization.yaml b/manifests/site/virtual-airship-core/target/workload-config/kustomization.yaml similarity index 100% rename from manifests/site/test-site/target/workload-config/kustomization.yaml rename to manifests/site/virtual-airship-core/target/workload-config/kustomization.yaml diff --git a/manifests/site/test-site/target/workload/kustomization.yaml b/manifests/site/virtual-airship-core/target/workload/kustomization.yaml similarity index 74% rename from manifests/site/test-site/target/workload/kustomization.yaml rename to manifests/site/virtual-airship-core/target/workload/kustomization.yaml index b0f3e58ae..8540ed9ce 100644 --- a/manifests/site/test-site/target/workload/kustomization.yaml +++ b/manifests/site/virtual-airship-core/target/workload/kustomization.yaml @@ -4,10 +4,10 @@ resources: transformers: - ./replacements - ../../../../type/airship-core/target/workload/replacements -# Removing rook-ceph storage cluster from test-site as the +# Removing rook-ceph storage cluster from virtual-airship-core as the # zuul gates seems to be failing often with timeout issues # Comment the below patch files if you want to deploy -# storage cluster as part of test-site workload +# storage cluster as part of virtual-airship-core workload patches: - patch-delete-storage-cluster.yaml - patch-deploy-false-storage-cluster.yaml diff --git a/manifests/site/test-site/target/workload/patch-delete-storage-cluster.yaml b/manifests/site/virtual-airship-core/target/workload/patch-delete-storage-cluster.yaml similarity index 100% rename from manifests/site/test-site/target/workload/patch-delete-storage-cluster.yaml rename to manifests/site/virtual-airship-core/target/workload/patch-delete-storage-cluster.yaml diff --git a/manifests/site/test-site/target/workload/patch-deploy-false-storage-cluster.yaml b/manifests/site/virtual-airship-core/target/workload/patch-deploy-false-storage-cluster.yaml similarity index 100% rename from manifests/site/test-site/target/workload/patch-deploy-false-storage-cluster.yaml rename to manifests/site/virtual-airship-core/target/workload/patch-deploy-false-storage-cluster.yaml diff --git a/manifests/site/test-site/target/workload/replacements/ceph-nodes.yaml b/manifests/site/virtual-airship-core/target/workload/replacements/ceph-nodes.yaml similarity index 100% rename from manifests/site/test-site/target/workload/replacements/ceph-nodes.yaml rename to manifests/site/virtual-airship-core/target/workload/replacements/ceph-nodes.yaml diff --git a/manifests/site/test-site/target/workload/replacements/kustomization.yaml b/manifests/site/virtual-airship-core/target/workload/replacements/kustomization.yaml similarity index 100% rename from manifests/site/test-site/target/workload/replacements/kustomization.yaml rename to manifests/site/virtual-airship-core/target/workload/replacements/kustomization.yaml diff --git a/manifests/site/virtual-network-cloud/target/encrypted/README.md b/manifests/site/virtual-network-cloud/target/encrypted/README.md index 633ba6e85..e662546a9 100644 --- a/manifests/site/virtual-network-cloud/target/encrypted/README.md +++ b/manifests/site/virtual-network-cloud/target/encrypted/README.md @@ -29,4 +29,4 @@ This container encrypt the secrets and write it to directory specified in `kusto To decrypt previously encrypted secrets we use [decrypt-secrets.yaml](results/decrypt-secrets.yaml). It will run the decrypt sops function when we run `KUSTOMIZE_PLUGIN_HOME=$(pwd)/manifests SOPS_IMPORT_PGP=$(cat key.asc) kustomize build --enable_alpha_plugins -manifests/site/test-site/target/catalogues/` +manifests/site/virtual-airship-core/target/catalogues/` diff --git a/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml b/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml index 30e1fec08..3c51213e5 100644 --- a/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml @@ -3,10 +3,10 @@ resources: - ../catalogues transformers: - ../../../../type/multi-tenant/target/workload/replacements -# Removing rook-ceph storage cluster from test-site as the +# Removing rook-ceph storage cluster from virtual-airship-core as the # zuul gates seems to be failing often with timeout issues # Comment the below patch files if you want to deploy -# storage cluster as part of test-site workload +# storage cluster as part of virtual-airship-core workload patches: - patch-delete-storage-cluster.yaml - patch-deploy-false-storage-cluster.yaml diff --git a/playbooks/vars/test-config.yaml b/playbooks/vars/test-config.yaml index 7496ba98b..ae5d24fe1 100644 --- a/playbooks/vars/test-config.yaml +++ b/playbooks/vars/test-config.yaml @@ -16,7 +16,7 @@ airship_config_phase_repo_url: "https://review.opendev.org/airship/airshipctl" airship_config_manifest_directory: "{{ remote_work_dir | default(zuul.project.src_dir) | default(local_src_dir) }}" airship_config_ephemeral_ip: "{{ airship_gate_ipam.nat_network.ephemeral_ip }}" airship_config_iso_builder_docker_image: "quay.io/airshipit/image-builder:latest-ubuntu_focal" -airship_config_site_path: manifests/site/test-site +airship_config_site_path: manifests/site/virtual-airship-core airship_config_ca_data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNU1USXlOakE0TWpneU5Gb1hEVEk1TVRJeU16QTRNamd5TkZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTTFSClM0d3lnajNpU0JBZjlCR0JUS1p5VTFwYmdDaGQ2WTdJektaZWRoakM2K3k1ZEJpWm81ZUx6Z2tEc2gzOC9YQ1MKenFPS2V5cE5RcDN5QVlLdmJKSHg3ODZxSFZZNjg1ZDVYVDNaOHNyVVRzVDR5WmNzZHAzV3lHdDM0eXYzNi9BSQoxK1NlUFErdU5JemN6bzNEdWhXR0ZoQjk3VjZwRitFUTBlVWN5bk05c2hkL3AwWVFzWDR1ZlhxaENENVpzZnZUCnBka3UvTWkyWnVGUldUUUtNeGpqczV3Z2RBWnBsNnN0L2ZkbmZwd1Q5cC9WTjRuaXJnMEsxOURTSFFJTHVrU2MKb013bXNBeDJrZmxITWhPazg5S3FpMEloL2cyczRFYTRvWURZemt0Y2JRZ24wd0lqZ2dmdnVzM3pRbEczN2lwYQo4cVRzS2VmVGdkUjhnZkJDNUZNQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFJek9BL00xWmRGUElzd2VoWjFuemJ0VFNURG4KRHMyVnhSV0VnclFFYzNSYmV3a1NkbTlBS3MwVGR0ZHdEbnBEL2tRYkNyS2xEeFF3RWg3NFZNSFZYYkFadDdsVwpCSm90T21xdXgxYThKYklDRTljR0FHRzFvS0g5R29jWERZY0JzOTA3ckxIdStpVzFnL0xVdG5hN1dSampqZnBLCnFGelFmOGdJUHZIM09BZ3B1RVVncUx5QU8ya0VnelZwTjZwQVJxSnZVRks2TUQ0YzFmMnlxWGxwNXhrN2dFSnIKUzQ4WmF6d0RmWUVmV3Jrdld1YWdvZ1M2SktvbjVEZ0Z1ZHhINXM2Snl6R3lPVnZ0eG1TY2FvOHNxaCs3UXkybgoyLzFVcU5ZK0hlN0x4d04rYkhwYkIxNUtIMTU5ZHNuS3BRbjRORG1jSTZrVnJ3MDVJMUg5ZGRBbGF0bz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= airship_config_client_cert_data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQwRENDQXJnQ0ZFdFBveEZYSjVrVFNWTXQ0OVlqcHBQL3hCYnlNQTBHQ1NxR1NJYjNEUUVCQ3dVQU1CVXgKRXpBUkJnTlZCQU1UQ210MVltVnlibVYwWlhNd0hoY05NakF3TVRJME1Ua3hOVEV3V2hjTk1qa3hNakF5TVRreApOVEV3V2pBME1Sa3dGd1lEVlFRRERCQnJkV0psY201bGRHVnpMV0ZrYldsdU1SY3dGUVlEVlFRS0RBNXplWE4wClpXMDZiV0Z6ZEdWeWN6Q0NBaUl3RFFZSktvWklodmNOQVFFQkJRQURnZ0lQQURDQ0Fnb0NnZ0lCQU1iaFhUUmsKVjZiZXdsUjBhZlpBdTBGYWVsOXRtRThaSFEvaGtaSHhuTjc2bDZUUFltcGJvaDRvRjNGMFFqbzROS1o5NVRuWgo0OWNoV240eFJiZVlPU25EcDBpV0Qzd0pXUlZ5aVFvVUFyYTlNcHVPNkVFU1FpbFVGNXNxc0VXUVdVMjBETStBCkdxK1k0Z2c3eDJ1Q0hTdk1GUmkrNEw5RWlXR2xnRDIvb1hXUm5NWEswNExQajZPb3Vkb2Zid2RmT3J6dTBPVkUKUzR0eGtuS1BCY1BUU3YxMWVaWVhja0JEVjNPbExENEZ3dTB3NTcwcnczNzAraEpYdlZxd3Zjb2RjZjZEL1BXWQowamlnd2ppeUJuZ2dXYW04UVFjd1Nud3o0d05sV3hKOVMyWUJFb1ptdWxVUlFaWVk5ZXRBcEpBdFMzTjlUNlQ2ClovSlJRdEdhZDJmTldTYkxEck5qdU1OTGhBYWRMQnhJUHpBNXZWWk5aalJkdEMwU25pMlFUMTVpSFp4d1RxcjQKakRQQ0pYRXU3KytxcWpQVldUaUZLK3JqcVNhS1pqVWZVaUpHQkJWcm5RZkJENHNtRnNkTjB5cm9tYTZOYzRMNQpKS21RV1NHdmd1aG0zbW5sYjFRaVRZanVyZFJQRFNmdmwrQ0NHbnA1QkkvZ1pwMkF1SHMvNUpKVTJlc1ZvL0xsCkVPdHdSOXdXd3dXcTAvZjhXS3R4bVRrMTUyOUp2dFBGQXQweW1CVjhQbHZlYnVwYmJqeW5pL2xWbTJOYmV6dWUKeCtlMEpNbGtWWnFmYkRSS243SjZZSnJHWW1CUFV0QldoSVkzb1pJVTFEUXI4SUlIbkdmYlZoWlR5ME1IMkFCQQp1dlVQcUtSVk80UGkxRTF4OEE2eWVPeVRDcnB4L0pBazVyR2RBZ01CQUFFd0RRWUpLb1pJaHZjTkFRRUxCUUFECmdnRUJBSWNFM1BxZHZDTVBIMnJzMXJESk9ESHY3QWk4S01PVXZPRi90RjlqR2EvSFBJbkh3RlVFNEltbldQeDYKVUdBMlE1bjFsRDFGQlU0T0M4eElZc3VvS1VQVHk1T0t6SVNMNEZnL0lEcG54STlrTXlmNStMR043aG8rblJmawpCZkpJblVYb0tERW1neHZzSWFGd1h6bGtSTDJzL1lKYUZRRzE1Uis1YzFyckJmd2dJOFA5Tkd6aEM1cXhnSmovCm04K3hPMGhXUmJIYklrQ21NekRib2pCSWhaL00rb3VYR1doei9TakpodXhZTVBnek5MZkFGcy9PMTVaSjd3YXcKZ3ZoSGc3L2E5UzRvUCtEYytPa3VrMkV1MUZjL0E5WHpWMzc5aWhNWW5ub3RQMldWeFZ3b0ZZQUg0NUdQcDZsUApCQmwyNnkxc2JMbjl6aGZYUUJIMVpFN0EwZVE9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K airship_config_client_key_data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS1FJQkFBS0NBZ0VBeHVGZE5HUlhwdDdDVkhScDlrQzdRVnA2WDIyWVR4a2REK0dSa2ZHYzN2cVhwTTlpCmFsdWlIaWdYY1hSQ09qZzBwbjNsT2RuajF5RmFmakZGdDVnNUtjT25TSllQZkFsWkZYS0pDaFFDdHIweW00N28KUVJKQ0tWUVhteXF3UlpCWlRiUU16NEFhcjVqaUNEdkhhNElkSzh3VkdMN2d2MFNKWWFXQVBiK2hkWkdjeGNyVApncytQbzZpNTJoOXZCMTg2dk83UTVVUkxpM0dTY284Rnc5TksvWFY1bGhkeVFFTlhjNlVzUGdYQzdURG52U3ZECmZ2VDZFbGU5V3JDOXloMXgvb1A4OVpqU09LRENPTElHZUNCWnFieEJCekJLZkRQakEyVmJFbjFMWmdFU2htYTYKVlJGQmxoajE2MENra0MxTGMzMVBwUHBuOGxGQzBacDNaODFaSnNzT3MyTzR3MHVFQnAwc0hFZy9NRG05VmsxbQpORjIwTFJLZUxaQlBYbUlkbkhCT3F2aU1NOElsY1M3djc2cXFNOVZaT0lVcjZ1T3BKb3BtTlI5U0lrWUVGV3VkCkI4RVBpeVlXeDAzVEt1aVpybzF6Z3Zra3FaQlpJYStDNkdiZWFlVnZWQ0pOaU82dDFFOE5KKytYNElJYWVua0UKaitCbW5ZQzRlei9ra2xUWjZ4V2o4dVVRNjNCSDNCYkRCYXJUOS94WXEzR1pPVFhuYjBtKzA4VUMzVEtZRlh3KwpXOTV1Nmx0dVBLZUwrVldiWTF0N081N0g1N1FreVdSVm1wOXNORXFmc25wZ21zWmlZRTlTMEZhRWhqZWhraFRVCk5DdndnZ2VjWjl0V0ZsUExRd2ZZQUVDNjlRK29wRlU3ZytMVVRYSHdEcko0N0pNS3VuSDhrQ1Rtc1owQ0F3RUEKQVFLQ0FnQUJ2U1N3ZVpRZW5HSDhsUXY4SURMQzdvU1ZZd0xxNWlCUDdEdjJsN00wYStKNWlXcWwzV2s4ZEVOSQpOYWtDazAwNmkyMCtwVDROdW5mdEZJYzBoTHN6TjBlMkpjRzY1dVlGZnZ2ZHY3RUtZZnNZU3hhU3d4TWJBMlkxCmNCa2NjcGVsUzBhMVpieFYvck16T1RxVUlRNGFQTzJPU3RUeU55b3dWVjhhcXh0QlNPV2pBUlA2VjlBOHNSUDIKNlVGeVFnM2thdjRla3d0S0M5TW85MEVvcGlkSXNnYy9IYk5kQm5tMFJDUnY0bU1DNmVPTXp0NGx0UVNldG0rcwpaRkUwZkM5cjkwRjE4RUVlUjZHTEYxdGhIMzlKTWFFcjYrc3F6TlZXU1VPVGxNN2M5SE55QTJIcnJudnhVUVNOCmF3SkZWSEFOY1hJSjBqcW9icmR6MTdMbGtIRVFGczNLdjRlcDR3REJKMlF0eisxdUFvY1JoV3ZSaWJxWEQ3THgKVmpPdGRyT1h3ZFQxY2ZrKzZRc1RMWUFKR3ptdDdsY1M2QjNnYzJHWmNJWGwyNVlqTUQ1ZVhpa1dEc3hYWmt1UAorb3MzVGhxeGZIS25ITmxtYk9SSVpDMW92Q1NkSTRWZVpzalk0MUs5K0dNaXdXSk1kektpRkp3NlR2blRSUldTCkxod2EzUTlBVmMvTEg0SC9PbU9qWDc0QTNZSWwrRDFVUHd3VzAvMmw4S3BNM0VWZ21XalJMV1ZIRnBNTGJNSlcKZVZKd3dKUmF3bWZLdHZ6bU9KRHlhTXJJblhqTDMvSE1EaWtwU3JhRzFyTnc1SUozOXJZdEFIUUQ1L1VuZlRkSApLNXVjakVucTdPdDMyR1ozcHJvRTU1ZGFBY0hQbktuOGpYZ1ZKTUQyOWh5cEZvL2ZRUUtDQVFFQStBbjRoSDFFCm9GK3FlcWlvYXR3N2cwaVdQUDNCeklxOEZWbWtsRlZBYVF5U28wU2QxWFBybmErR0RFQVd0cHlsVjF5ZkZkR2oKSHc4YXU5NnpUZnRuNWZCRkQxWG1NTkNZeTcrM293V3ArK1NwYUMvMTYzN1dvb3lLRjBjVFNvcWEzZEVuRUtSSwp4TGF2a0lFUTI3OXRBNFVUK0dVK3pTb0NPUFBNNE1JS3poR0FDczZ1anRySzFNcXpwK0JhYldzRlBuN2J1bStVCkRHSFIrNCtab2tBL1Q2N2luYlRxZUwwVzJCNjRMckFURHpZL3Y4NlRGbW1aallEaHRKR1JIWVZUOU9XSXR0RVkKNnZtUDN0a1dOTWt0R2w4bTFiQ0FHQ1JlcGtycUhxWXNMWG5GQ2ZZSFFtOXNpaGgvM3JFVjZ1MUYxZCt0U3JFMgprU1ZVOHhVWDUwbHFNUUtDQVFFQXpVTjZaS0lRNldkT09FR3ZyMExRL1hVczI0bUczN3lGMjhJUDJEcWFBWWVzCnJza2xTdjdlSU9TZWV3MW1CRHVCRkl2bkZvcTVsRlA3cXhWcEIyWjNNSGlDMVNaclZSZjlQTjdCNGFzcmNyMCsKdDB2S0NXWFFIaTVQQXhucXdYb2E2N0Q1bnkwdnlvV0lVUXAyZEZMdkIwQmp0b3MvajJFaHpJZk5WMm1UOW15bgpWQXZOWEdtZnc4SVJCL1diMGkzQ3c0Wityb1l1dTJkRHo2UUwzUFVvN1hLS3ljZzR1UzU1eksvcWZPc09lYm5mCnpsd3ZqbGxNSitmVFFHNzMrQnpINE5IWGs2akZZQzU4eXBrdXd0cmJmYk1pSkZOWThyV1ptL01Nd1VDWlZDQ3kKeUlxQ3FHQVB6b2kyU05zSEtaTlJqN3ZZQ3dQQVd6TzFidjFGcC9hM0xRS0NBUUVBeG0zTGw4cFROVzF6QjgrWApkRzJkV3FpZU1FcmRXRklBcDUvZ1R4NW9lZUdxQ2QxaDJ4cHlldUtwZlhGaitsRVU0Ty9qQU9TRjk5bndqQzFjCkNsMit2Ni9ZdjZ6N2l6L0ZqUEpoNlpRbGFiT0RaeXMvTkZkelEvVGtvRHluRFRJWE5LOFc3blJRc0ZCcDRWT3YKZGUwTlBBeWhiazBvMFo3eXlqY1lSeEpVN0lnSmhCdldmOGcvRGI3ZnZNUjU4eUR6d0F4aW9pS1RNTmlzMFBBUAplMEtrbzQySUU1eGhHNWhDQjBHRUhTMlZBYzFuY0gzRkk5LzFETVAzVEtwTGltOVlQQW5JdG1CTzYrUWNtYTNYCjJ3QzZDV2ZudkhvSDc4aGd3KzRZbjg1V2QwYjhQN3pJRC9qdHZ3aGNlMzMxeDh4cjJ1Nm5ScUxBd1pzNCs0SjcKYmZkSWNRS0NBUUFDL2JlNzNheTNhZnoyenVZN2ZKTEZEcjhQbCtweU9qSU5LTC9JVzlwQXFYUjN1NUNpamlJNApnbnhZdUxKQzM0Y2JBSXJtaGpEOEcxa3dmZ2hneGpwNFoxa290LzJhYU5ZVTIvNGhScmhFWE1PY01pdUloWVpKCjJrem1jNnM3RklkdDVjOU5aWUFyeUZSYk1mYlY3UnQwbEppZllWb1V3Y3FYUzJkUG5jYzlNUW9qTEdUYXN1TlUKRy9EWmw5ZWtjV3hFSXlLWGNuY2QzZnhiK3p6OUJFbUxaRDduZjlacnhHU2IrZmhGeDdzWFJRRWc1YkQvdHdkbwpFWFcvbTU1YmJEZnhhNzFqZG5NaDJxdVEzRGlWT0ZFNGZMTERxcjlDRWlsaDMySFJNeHJJNGcwWTVRUFFaazMwCnFZTldmbktWUllOTHYrWC9DeGZ6ZkVacGpxRkVPRkVsQW9JQkFRQ0t6R2JGdmx6d1BaUmh4czd2VXYxOXlIUXAKQzFmR3gwb0tpRDFSNWZwWVBrT0VRQWVudEFKRHNyYVRsNy9rSDY5V09VbUQ1T3gxbWpyRFB0a1M4WnhXYlJXeApGYjJLK3JxYzRtcGFacGROV09OTkszK3RNZmsrb0FRcWUySU1JV253NUhmbVpjNE1QY0t0bkZQYlJTTkF0aktwCkQ2aG9oL3BXMmdjRFA0cVpNWVZvRW04MVZYZEZDUGhOYitNYnUvU3gyaFB4U0dXYTVGaTczeEtwWWp5M3BISlQKWFoyY2lHN0VNQ3NKZW9HS2FRdmNCY1kvNGlSRGFoV0hWcmlsSVhJQXJQdXdmVUIybzZCZFR0allHeU5sZ2NmeApxWEt4aXBTaEE2VlNienVnR3pkdEdNeEUyekRHVEkxOXFSQy96OUNEREM1ZTJTQUZqbEJUV0QyUHJjcU4KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K diff --git a/tools/deployment/common/22_test_configs.sh b/tools/deployment/common/22_test_configs.sh index c971d5eb6..1cb07d8cf 100755 --- a/tools/deployment/common/22_test_configs.sh +++ b/tools/deployment/common/22_test_configs.sh @@ -17,7 +17,7 @@ set -xe : ${AIRSHIPCTL_PROJECT:="../airshipctl"} : ${TREASUREMAP_PROJECT:="$(pwd)"} -export SITE=${SITE:-"test-site"} +export SITE=${SITE:-"virtual-airship-core"} export AIRSHIP_CONFIG_METADATA_PATH=${AIRSHIP_CONFIG_METADATA_PATH:-"manifests/site/$SITE/metadata.yaml"} export AIRSHIP_CONFIG_MANIFEST_DIRECTORY=${AIRSHIP_CONFIG_MANIFEST_DIRECTORY:-"/tmp/treasuremap"} diff --git a/tools/deployment/common/23_generate_secrets.sh b/tools/deployment/common/23_generate_secrets.sh index e9084956a..de285b033 100755 --- a/tools/deployment/common/23_generate_secrets.sh +++ b/tools/deployment/common/23_generate_secrets.sh @@ -17,7 +17,7 @@ set -xe : ${AIRSHIPCTL_PROJECT:="../airshipctl"} : ${TREASUREMAP_PROJECT:="$(pwd)"} -export SITE=${SITE:-"test-site"} +export SITE=${SITE:-"virtual-airship-core"} export AIRSHIP_CONFIG_METADATA_PATH=${AIRSHIP_CONFIG_METADATA_PATH:-"treasuremap/manifests/site/$SITE/metadata.yaml"} # Setting the same value as targetPath that gets updated after create config step (22_test_configs.sh) export AIRSHIP_CONFIG_MANIFEST_DIRECTORY=${AIRSHIP_CONFIG_MANIFEST_DIRECTORY:-"/tmp/treasuremap"} diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 4f88da823..64cd4d6e7 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -45,7 +45,7 @@ pass-to-parent: true - job: - name: airship-treasuremap-deploy-test-site + name: airship-treasuremap-deploy-virtual-airship-core attempts: 1 timeout: 10800 required-projects: @@ -59,7 +59,7 @@ post-run: playbooks/airship-collect-logs.yaml run: playbooks/airship-treasuremap-gate-runner.yaml files: - - ^manifests/site/test-site/.*$ + - ^manifests/site/virtual-airship-core/.*$ - ^manifests/type/airship-core/.*$ - ^manifests/function/.*$ - ^manifests/composite/.*$ @@ -68,7 +68,7 @@ - ^tools/deployment/.*$ nodeset: airship-treasuremap-single-32GB-bionic-node vars: - site_name: test-site + site_name: virtual-airship-core gate_scripts: - ./tools/deployment/airship-core/01_install_essentials.sh - ./tools/deployment/airship-core/22_test_configs.sh @@ -82,7 +82,7 @@ - job: name: airship-treasuremap-deploy-virtual-network-cloud - parent: airship-treasuremap-deploy-test-site + parent: airship-treasuremap-deploy-virtual-airship-core vars: site_name: virtual-network-cloud gate_scripts: diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index d3d4c6220..6b79e195d 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -20,12 +20,12 @@ jobs: - airship-treasuremap-validate-site-docs # - airship-treasuremap-functional-existing-k8s TODO: Enable this when functional tests exist, and a cluster is up - - airship-treasuremap-deploy-test-site + - airship-treasuremap-deploy-virtual-airship-core gate: jobs: - noop - airship-treasuremap-validate-site-docs - - airship-treasuremap-deploy-test-site + - airship-treasuremap-deploy-virtual-airship-core # - airship-treasuremap-functional-existing-k8s TODO: Enable this when functional tests exist, and a cluster is up experimental: jobs: