Merge pull request #3754 from Ankitasw/cc-tests

Restructure e2e templates directory

Author: k8s-ci-robot

Makefile

@@ -368,7 +368,11 @@ $(ARTIFACTS):
 
 .PHONY: generate-test-flavors
 generate-test-flavors: $(KUSTOMIZE)  ## Generate test template flavors
-	./hack/gen-test-flavors.sh
+	./hack/gen-test-flavors.sh withoutclusterclass
+
+.PHONY: generate-clusterclass-test-flavors
+generate-clusterclass-test-flavors: $(KUSTOMIZE)  ## Generate ClusterClass test template flavors
+	./hack/gen-test-flavors.sh withclusterclass
 
 .PHONY: e2e-image
 e2e-image: docker-pull-prerequisites $(TOOLS_BIN_DIR)/start.sh $(TOOLS_BIN_DIR)/restart.sh ## Build an e2e test image
@@ -397,7 +401,7 @@ test-verbose: setup-envtest ## Run tests with verbose settings.
 	KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" go test -v ./...
 
 .PHONY: test-e2e ## Run e2e tests using clusterctl
-test-e2e: $(GINKGO) $(KIND) $(SSM_PLUGIN) $(KUSTOMIZE) generate-test-flavors e2e-image ## Run e2e tests
+test-e2e: $(GINKGO) $(KIND) $(SSM_PLUGIN) $(KUSTOMIZE) generate-test-flavors generate-clusterclass-test-flavors e2e-image ## Run e2e tests
 	time $(GINKGO) -tags=e2e $(GINKGO_ARGS) -p ./test/e2e/suites/unmanaged/... -- -config-path="$(E2E_CONF_PATH)" $(E2E_ARGS)
 
 .PHONY: test-e2e-eks ## Run EKS e2e tests using clusterctl

hack/gen-test-flavors.sh

@@ -22,7 +22,8 @@ set -o pipefail
 root=$(dirname "${BASH_SOURCE[0]}")/..
 kustomize="${root}/hack/tools/bin/kustomize"
 test_dir_path="test/e2e/data/infrastructure-aws"
-test_dir="${root}/${test_dir_path}"
+sub_dir_path=$1
+test_dir="${root}/${test_dir_path}/${sub_dir_path}"
 src_dir="${test_dir}/kustomize_sources/"
 generated_dir="${test_dir}/generated"
 test_templates="${test_dir}/e2e_test_templates"
@@ -35,6 +36,9 @@ mkdir -p "${generated_dir}"
 find "${src_dir}"* -maxdepth 1 -type d \
   -print0 | xargs -0 -I {} basename {} | grep -v -E '(patches|addons|cni|base)' | xargs -t -I {} ${kustomize} build --load-restrictor LoadRestrictionsNone --reorder none ${src_dir}{} -o ${generated_dir}/cluster-template-{}.yaml
 
-## move the default template to the default file expected by clusterctl
-mv "${generated_dir}/cluster-template-default.yaml" "${generated_dir}/cluster-template.yaml"
-cp -r ${generated_dir} ${test_templates}
+
+## move the default template to the default file expected by clusterctl in case of withoutclusterclass
+if [ "${sub_dir_path}" == "withoutclusterclass" ]
+then
+  mv "${generated_dir}/cluster-template-default.yaml" "${generated_dir}/cluster-template.yaml"
+fi

test/e2e/data/e2e_conf.yaml

@@ -96,34 +96,34 @@ providers:
         value: ../../../config/default
         # Do not add contract field for v1beta1 --> v1beta2 clusterctl upgrades test to work.
         files:
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-efs-support.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-external-csi.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-csimigration-off.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-external-cloud-provider.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-kcp-remediation.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-kcp-scale-in.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-limit-az.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-machine-pool.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-md-remediation.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-nested-multitenancy.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-remote-management-cluster.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-simple-multitenancy.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-spot-instances.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-ssm.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-topology.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-upgrade-to-main.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-gpu.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-upgrades.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-peered-remote.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-internal-elb.yaml"
-          - sourcePath: "./infrastructure-aws/kustomize_sources/topology/clusterclass-ci-default.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-nested-multitenancy-clusterclass.yaml"
-          - sourcePath: "./infrastructure-aws/kustomize_sources/nested-multitenancy-clusterclass/clusterclass-multi-tenancy.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-self-hosted-clusterclass.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-external-vpc-clusterclass.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-efs-support.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-external-csi.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-csimigration-off.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-external-cloud-provider.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-kcp-remediation.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-kcp-scale-in.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-limit-az.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-machine-pool.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-md-remediation.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-nested-multitenancy.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-remote-management-cluster.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-simple-multitenancy.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-spot-instances.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-ssm.yaml"
+          - sourcePath: "./infrastructure-aws/withclusterclass/generated/cluster-template-topology.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-upgrade-to-main.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-gpu.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-upgrades.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-peered-remote.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-internal-elb.yaml"
+          - sourcePath: "./infrastructure-aws/withclusterclass/kustomize_sources/topology/clusterclass-ci-default.yaml"
+          - sourcePath: "./infrastructure-aws/withclusterclass/generated/cluster-template-nested-multitenancy-clusterclass.yaml"
+          - sourcePath: "./infrastructure-aws/withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/clusterclass-multi-tenancy.yaml"
+          - sourcePath: "./infrastructure-aws/withclusterclass/generated/cluster-template-self-hosted-clusterclass.yaml"
+          - sourcePath: "./infrastructure-aws/withclusterclass/generated/cluster-template-external-vpc-clusterclass.yaml"
           - sourcePath: "./shared/v1beta2_provider/metadata.yaml"
-          - sourcePath: "./infrastructure-aws/generated/cluster-template-ignition.yaml"
+          - sourcePath: "./infrastructure-aws/withoutclusterclass/generated/cluster-template-ignition.yaml"
         replacements:
           # To allow bugs to be catched.
           - old: "failureThreshold: 3"

test/e2e/data/infrastructure-aws/.gitignore

@@ -1 +1,2 @@
-generated
+withoutclusterclass/generated
+withclusterclass/generated