Merge pull request #634 from chewong/patch-ci-entrypoint

🏃 remove unused ci script and rename templates
kubernetes-sigs · May 20, 2020 · fc0a458 · fc0a458
2 parents b6738e6 + e5e73b5
commit fc0a458
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 174 deletions.
diff --git a/scripts/ci-conformance.sh b/scripts/ci-conformance.sh
diff --git a/scripts/ci-entrypoint.sh b/scripts/ci-entrypoint.sh
@@ -75,11 +75,11 @@ create_cluster() {
         else
             CI_VERSION_URL="https://dl.k8s.io/ci/k8s-master.txt"
         fi
-        export CLUSTER_TEMPLATE="test/cluster-template-conformance-ci-version.yaml"
+        export CLUSTER_TEMPLATE="test/cluster-template-prow-ci-version.yaml"
         export CI_VERSION="${CI_VERSION:-$(curl -sSL ${CI_VERSION_URL})}"
         export KUBERNETES_VERSION="${CI_VERSION}"
     else
-        export CLUSTER_TEMPLATE="test/cluster-template-conformance.yaml"
+        export CLUSTER_TEMPLATE="test/cluster-template-prow.yaml"
     fi
 
     export CLUSTER_NAME="capz-$(head /dev/urandom | LC_ALL=C tr -dc a-z0-9 | head -c 6 ; echo '')"
@@ -94,8 +94,6 @@ create_cluster() {
 }
 
 run_upstream_e2e_tests() {
-    # export the target cluster KUBECONFIG if not already set
-    export KUBECONFIG="${KUBECONFIG:-${PWD}/kubeconfig}"
     # ginkgo regexes
     SKIP="${SKIP:-}"
     FOCUS="${FOCUS:-"\\[Conformance\\]"}"
@@ -162,6 +160,9 @@ if [[ -z "${SKIP_CREATE_CLUSTER:-}" ]]; then
     create_cluster
 fi
 
+# export the target cluster KUBECONFIG if not already set
+export KUBECONFIG="${KUBECONFIG:-${PWD}/kubeconfig}"
+
 # build k8s binaries and run upstream e2e tests
 if [[ -z "${SKIP_UPSTREAM_E2E_TESTS:-}" ]]; then
     build_k8s

diff --git a/...ster-template-conformance-ci-version.yaml → ...est/cluster-template-prow-ci-version.yaml b/...ster-template-conformance-ci-version.yaml → ...est/cluster-template-prow-ci-version.yaml
@@ -25,7 +25,7 @@ metadata:
 spec:
   additionalTags:
     creationTimestamp: ${TIMESTAMP}
-    jobName: cluster-api-provider-azure-conformance
+    jobName: ${JOB_NAME}
   location: ${AZURE_LOCATION}
   networkSpec:
     vnet:

diff --git a/...es/test/cluster-template-conformance.yaml → templates/test/cluster-template-prow.yaml b/...es/test/cluster-template-conformance.yaml → templates/test/cluster-template-prow.yaml
@@ -25,7 +25,7 @@ metadata:
 spec:
   additionalTags:
     creationTimestamp: ${TIMESTAMP}
-    jobName: cluster-api-provider-azure-conformance
+    jobName: ${JOB_NAME}
   location: ${AZURE_LOCATION}
   networkSpec:
     vnet:

diff --git a/...conformance-ci-version/kustomization.yaml → ...s/test/prow-ci-version/kustomization.yaml b/...conformance-ci-version/kustomization.yaml → ...s/test/prow-ci-version/kustomization.yaml
@@ -1,8 +1,7 @@
-
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-  - ../conformance
+  - ../prow
 patchesStrategicMerge:
   - patches/ci-version.yaml
diff --git a/...rmance-ci-version/patches/ci-version.yaml → ...t/prow-ci-version/patches/ci-version.yaml b/...rmance-ci-version/patches/ci-version.yaml → ...t/prow-ci-version/patches/ci-version.yaml
diff --git a/...lates/test/conformance/kustomization.yaml → templates/test/prow/kustomization.yaml b/...lates/test/conformance/kustomization.yaml → templates/test/prow/kustomization.yaml
@@ -1,8 +1,7 @@
-
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
   - ../../flavors/default
 patchesStrategicMerge:
-  - patches/conformance-tags.yaml
+  - patches/tags.yaml
diff --git a/...conformance/patches/conformance-tags.yaml → templates/test/prow/patches/tags.yaml b/...conformance/patches/conformance-tags.yaml → templates/test/prow/patches/tags.yaml
@@ -4,5 +4,5 @@ metadata:
   name: ${CLUSTER_NAME}
 spec:
   additionalTags:
-    jobName: 'cluster-api-provider-azure-conformance'
-    creationTimestamp: ${TIMESTAMP}
+    jobName: ${JOB_NAME}
+    creationTimestamp: ${TIMESTAMP}