From a3aeb6cd00d1a93716dd5818233cbea318b4e937 Mon Sep 17 00:00:00 2001 From: Rishabh Kumar Jain Date: Thu, 5 Nov 2020 17:08:13 -0800 Subject: [PATCH] docker-test-site for docker provider (capd) * adjust docker-test-site to execute the below phases with docker provider clusterctl-init-ephemeral controlplane-ephemeral clusterctl-init-target clusterctl-move workers-target Change-Id: I781189d9e1689237f8736e6d64a73014aed5b3c3 --- .../{target => ephemeral}/controlplane/kustomization.yaml | 0 .../{target => ephemeral}/controlplane/machine_count.json | 0 manifests/site/docker-test-site/phases/plan.yaml | 5 +++-- .../docker-test-site/target/initinfra/kustomization.yaml | 4 ---- 4 files changed, 3 insertions(+), 6 deletions(-) rename manifests/site/docker-test-site/{target => ephemeral}/controlplane/kustomization.yaml (100%) rename manifests/site/docker-test-site/{target => ephemeral}/controlplane/machine_count.json (100%) delete mode 100644 manifests/site/docker-test-site/target/initinfra/kustomization.yaml diff --git a/manifests/site/docker-test-site/target/controlplane/kustomization.yaml b/manifests/site/docker-test-site/ephemeral/controlplane/kustomization.yaml similarity index 100% rename from manifests/site/docker-test-site/target/controlplane/kustomization.yaml rename to manifests/site/docker-test-site/ephemeral/controlplane/kustomization.yaml diff --git a/manifests/site/docker-test-site/target/controlplane/machine_count.json b/manifests/site/docker-test-site/ephemeral/controlplane/machine_count.json similarity index 100% rename from manifests/site/docker-test-site/target/controlplane/machine_count.json rename to manifests/site/docker-test-site/ephemeral/controlplane/machine_count.json diff --git a/manifests/site/docker-test-site/phases/plan.yaml b/manifests/site/docker-test-site/phases/plan.yaml index 116cc8b3f..ceebf9779 100644 --- a/manifests/site/docker-test-site/phases/plan.yaml +++ b/manifests/site/docker-test-site/phases/plan.yaml @@ -6,6 +6,7 @@ phaseGroups: - name: group1 phases: - name: clusterctl-init-ephemeral - - name: controlplane-target - - name: workers-target + - name: controlplane-ephemeral - name: clusterctl-init-target + - name: clusterctl-move + - name: workers-target diff --git a/manifests/site/docker-test-site/target/initinfra/kustomization.yaml b/manifests/site/docker-test-site/target/initinfra/kustomization.yaml deleted file mode 100644 index c2942afaa..000000000 --- a/manifests/site/docker-test-site/target/initinfra/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -resources: - - ../../shared/clusterctl -commonLabels: - airshipit.org/stage: initinfra