Merge pull request #7147 from BenTheElder/refactor-ci-jobs

Refactor ci jobs
kubernetes · Mar 6, 2018 · fb79e93 · fb79e93
2 parents 26877ed + 227cdec
commit fb79e93
Show file tree

Hide file tree

Showing 2 changed files with 406 additions and 607 deletions.
diff --git a/jobs/config.json b/jobs/config.json
@@ -8899,11 +8899,11 @@
       "--cluster=",
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
-      "--extract=ci/latest-1.10",
+      "--extract=ci/latest-bazel-1.10",
       "--gcp-zone=us-central1-f",
       "--kubeadm=ci",
-      "--kubernetes-anywhere-kubelet-ci-version=latest-1.10",
-      "--kubernetes-anywhere-kubernetes-version=latest-1.10",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.10",
+      "--kubernetes-anywhere-kubernetes-version=latest-bazel-1.10",
       "--provider=kubernetes-anywhere",
       "--test_args=--ginkgo.focus=\\[Conformance\\]|\\[Feature:BootstrapTokens\\]|\\[Feature:NodeAuthorizer\\] --minStartupPods=8",
       "--timeout=300m"
@@ -8918,11 +8918,11 @@
       "--cluster=",
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
-      "--extract=ci/latest-1.7",
+      "--extract=ci/latest-bazel-1.7",
       "--gcp-zone=us-central1-f",
       "--kubeadm=ci",
-      "--kubernetes-anywhere-kubelet-ci-version=latest-1.7",
-      "--kubernetes-anywhere-kubernetes-version=latest-1.7",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.7",
+      "--kubernetes-anywhere-kubernetes-version=latest-bazel-1.7",
       "--provider=kubernetes-anywhere",
       "--test_args=--ginkgo.focus=\\[Conformance\\] --minStartupPods=8",
       "--timeout=300m"
@@ -8937,11 +8937,11 @@
       "--cluster=",
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
-      "--extract=ci/latest-1.7",
+      "--extract=ci/latest-bazel-1.7",
       "--gcp-zone=us-central1-f",
       "--kubeadm=ci",
-      "--kubernetes-anywhere-kubelet-ci-version=latest-1.7",
-      "--kubernetes-anywhere-kubernetes-version=latest-1.7",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.7",
+      "--kubernetes-anywhere-kubernetes-version=latest-bazel-1.7",
       "--provider=kubernetes-anywhere",
       "--test_args=--ginkgo.focus=\\[Conformance\\] --minStartupPods=8",
       "--timeout=300m"
@@ -8956,11 +8956,11 @@
       "--cluster=",
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
-      "--extract=ci/latest-1.8",
+      "--extract=ci/latest-bazel-1.8",
       "--gcp-zone=us-central1-f",
       "--kubeadm=ci",
-      "--kubernetes-anywhere-kubelet-ci-version=latest-1.8",
-      "--kubernetes-anywhere-kubernetes-version=latest-1.8",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.8",
+      "--kubernetes-anywhere-kubernetes-version=latest-bazel-1.8",
       "--provider=kubernetes-anywhere",
       "--test_args=--ginkgo.focus=\\[Conformance\\]|\\[Feature:BootstrapTokens\\]|\\[Feature:NodeAuthorizer\\] --minStartupPods=8",
       "--timeout=300m"
@@ -8975,11 +8975,11 @@
       "--cluster=",
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
-      "--extract=ci/latest-1.8",
+      "--extract=ci/latest-bazel-1.8",
       "--gcp-zone=us-central1-f",
       "--kubeadm=ci",
-      "--kubernetes-anywhere-kubelet-ci-version=latest-1.8",
-      "--kubernetes-anywhere-kubernetes-version=latest-1.8",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.8",
+      "--kubernetes-anywhere-kubernetes-version=latest-bazel-1.8",
       "--provider=kubernetes-anywhere",
       "--test_args=--ginkgo.focus=\\[Conformance\\]|\\[Feature:BootstrapTokens\\]|\\[Feature:NodeAuthorizer\\] --minStartupPods=8",
       "--timeout=300m"
@@ -8994,11 +8994,11 @@
       "--cluster=",
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
-      "--extract=ci/latest-1.9",
+      "--extract=ci/latest-bazel-1.9",
       "--gcp-zone=us-central1-f",
       "--kubeadm=ci",
-      "--kubernetes-anywhere-kubelet-ci-version=latest-1.9",
-      "--kubernetes-anywhere-kubernetes-version=latest-1.9",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.9",
+      "--kubernetes-anywhere-kubernetes-version=latest-bazel-1.9",
       "--provider=kubernetes-anywhere",
       "--test_args=--ginkgo.focus=\\[Conformance\\]|\\[Feature:BootstrapTokens\\]|\\[Feature:NodeAuthorizer\\] --minStartupPods=8",
       "--timeout=300m"
@@ -9013,11 +9013,11 @@
       "--cluster=",
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
-      "--extract=ci/latest-1.9",
+      "--extract=ci/latest-bazel-1.9",
       "--gcp-zone=us-central1-f",
       "--kubeadm=ci",
-      "--kubernetes-anywhere-kubelet-ci-version=latest-1.9",
-      "--kubernetes-anywhere-kubernetes-version=latest-1.9",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.9",
+      "--kubernetes-anywhere-kubernetes-version=latest-bazel-1.9",
       "--provider=kubernetes-anywhere",
       "--test_args=--ginkgo.focus=\\[Conformance\\]|\\[Feature:BootstrapTokens\\]|\\[Feature:NodeAuthorizer\\] --minStartupPods=8",
       "--timeout=300m"
@@ -9032,12 +9032,12 @@
       "--cluster=",
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
-      "--extract=ci/latest",
+      "--extract=ci/latest-bazel",
       "--gcp-zone=us-central1-f",
       "--kubeadm=ci",
       "--kubernetes-anywhere-cni=calico",
-      "--kubernetes-anywhere-kubelet-ci-version=latest",
-      "--kubernetes-anywhere-kubernetes-version=ci/latest",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel",
+      "--kubernetes-anywhere-kubernetes-version=ci/latest-bazel",
       "--provider=kubernetes-anywhere",
       "--test_args=--ginkgo.focus=\\[Conformance\\]|\\[Feature:BootstrapTokens\\]|\\[Feature:NodeAuthorizer\\] --minStartupPods=8",
       "--timeout=300m"
@@ -9052,12 +9052,12 @@
       "--cluster=",
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
-      "--extract=ci/latest",
+      "--extract=ci/latest-bazel",
       "--gcp-zone=us-central1-f",
       "--kubeadm=ci",
       "--kubernetes-anywhere-cni=flannel",
-      "--kubernetes-anywhere-kubelet-ci-version=latest",
-      "--kubernetes-anywhere-kubernetes-version=ci/latest",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel",
+      "--kubernetes-anywhere-kubernetes-version=ci/latest-bazel",
       "--provider=kubernetes-anywhere",
       "--test_args=--ginkgo.focus=\\[Conformance\\]|\\[Feature:BootstrapTokens\\]|\\[Feature:NodeAuthorizer\\] --minStartupPods=8",
       "--timeout=300m"
@@ -9072,13 +9072,13 @@
       "--cluster=",
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
-      "--extract=ci/latest",
+      "--extract=ci/latest-bazel",
       "--gcp-zone=us-central1-f",
       "--kubeadm=ci",
       "--kubernetes-anywhere-dump-cluster-logs=true",
       "--kubernetes-anywhere-kubeadm-feature-gates=CoreDNS=true",
-      "--kubernetes-anywhere-kubelet-ci-version=latest",
-      "--kubernetes-anywhere-kubernetes-version=ci/latest",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel",
+      "--kubernetes-anywhere-kubernetes-version=ci/latest-bazel",
       "--provider=kubernetes-anywhere",
       "--test_args=--ginkgo.focus=\\[Conformance\\]|\\[Feature:BootstrapTokens\\]|\\[Feature:NodeAuthorizer\\] --minStartupPods=8",
       "--timeout=300m"
@@ -9093,11 +9093,11 @@
       "--cluster=",
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
-      "--extract=ci/latest",
+      "--extract=ci/latest-bazel",
       "--gcp-zone=us-central1-f",
       "--kubeadm=ci",
-      "--kubernetes-anywhere-kubelet-ci-version=latest",
-      "--kubernetes-anywhere-kubernetes-version=ci/latest",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel",
+      "--kubernetes-anywhere-kubernetes-version=ci/latest-bazel",
       "--kubernetes-anywhere-proxy-mode=ipvs",
       "--provider=kubernetes-anywhere",
       "--test_args=--ginkgo.focus=\\[Conformance\\]|\\[Feature:BootstrapTokens\\]|\\[Feature:NodeAuthorizer\\] --minStartupPods=8",
@@ -10821,11 +10821,11 @@
       "--cluster=",
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
-      "--extract=ci/latest-1.10",
+      "--extract=ci/latest-bazel-1.10",
       "--gcp-zone=us-central1-f",
       "--kubeadm=ci",
-      "--kubernetes-anywhere-kubelet-ci-version=latest-1.10",
-      "--kubernetes-anywhere-kubernetes-version=latest-1.10",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.10",
+      "--kubernetes-anywhere-kubernetes-version=latest-bazel-1.10",
       "--provider=kubernetes-anywhere",
       "--test_args=--ginkgo.focus=\\[Conformance\\]|\\[Feature:BootstrapTokens\\]|\\[Feature:NodeAuthorizer\\] --minStartupPods=8",
       "--timeout=300m"
@@ -10840,11 +10840,11 @@
       "--cluster=",
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
-      "--extract=ci/latest-1.7",
+      "--extract=ci/latest-bazel-1.7",
       "--gcp-zone=us-central1-f",
       "--kubeadm=periodic",
-      "--kubernetes-anywhere-kubelet-ci-version=latest-1.7",
-      "--kubernetes-anywhere-kubernetes-version=latest-1.7",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.7",
+      "--kubernetes-anywhere-kubernetes-version=latest-bazel-1.7",
       "--provider=kubernetes-anywhere",
       "--test_args=--ginkgo.focus=\\[Conformance\\] --minStartupPods=8",
       "--timeout=300m"
@@ -10859,11 +10859,11 @@
       "--cluster=",
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
-      "--extract=ci/latest-1.8",
+      "--extract=ci/latest-bazel-1.8",
       "--gcp-zone=us-central1-f",
       "--kubeadm=periodic",
-      "--kubernetes-anywhere-kubelet-ci-version=latest-1.8",
-      "--kubernetes-anywhere-kubernetes-version=latest-1.8",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.8",
+      "--kubernetes-anywhere-kubernetes-version=latest-bazel-1.8",
       "--provider=kubernetes-anywhere",
       "--test_args=--ginkgo.focus=\\[Conformance\\]|\\[Feature:BootstrapTokens\\]|\\[Feature:NodeAuthorizer\\] --minStartupPods=8",
       "--timeout=300m"
@@ -10878,11 +10878,11 @@
       "--cluster=",
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
-      "--extract=ci/latest-1.9",
+      "--extract=ci/latest-bazel-1.9",
       "--gcp-zone=us-central1-f",
       "--kubeadm=ci",
-      "--kubernetes-anywhere-kubelet-ci-version=latest-1.9",
-      "--kubernetes-anywhere-kubernetes-version=latest-1.9",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.9",
+      "--kubernetes-anywhere-kubernetes-version=latest-bazel-1.9",
       "--provider=kubernetes-anywhere",
       "--test_args=--ginkgo.focus=\\[Conformance\\]|\\[Feature:BootstrapTokens\\]|\\[Feature:NodeAuthorizer\\] --minStartupPods=8",
       "--timeout=300m"
@@ -10897,13 +10897,13 @@
       "--cluster=",
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
-      "--extract=ci/latest",
+      "--extract=ci/latest-bazel",
       "--gcp-zone=us-central1-f",
       "--kubeadm=ci",
       "--kubernetes-anywhere-dump-cluster-logs=true",
       "--kubernetes-anywhere-kubeadm-feature-gates=SelfHosting=true",
-      "--kubernetes-anywhere-kubelet-ci-version=latest",
-      "--kubernetes-anywhere-kubernetes-version=ci/latest",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel",
+      "--kubernetes-anywhere-kubernetes-version=ci/latest-bazel",
       "--provider=kubernetes-anywhere",
       "--test_args=--ginkgo.focus=\\[Conformance\\]|\\[Feature:BootstrapTokens\\]|\\[Feature:NodeAuthorizer\\] --minStartupPods=8",
       "--timeout=300m"
@@ -10919,11 +10919,11 @@
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
       "--extract=release/latest-1.8",
-      "--extract=ci/latest-1.7",
+      "--extract=ci/latest-bazel-1.7",
       "--gcp-zone=us-central1-f",
       "--kubeadm=periodic",
-      "--kubernetes-anywhere-kubelet-ci-version=latest-1.7",
-      "--kubernetes-anywhere-kubernetes-version=latest-1.7",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.7",
+      "--kubernetes-anywhere-kubernetes-version=latest-bazel-1.7",
       "--kubernetes-anywhere-upgrade-method=upgrade",
       "--provider=kubernetes-anywhere",
       "--skew",
@@ -10942,11 +10942,11 @@
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
       "--extract=release/latest-1.9",
-      "--extract=ci/latest-1.8",
+      "--extract=ci/latest-bazel-1.8",
       "--gcp-zone=us-central1-f",
       "--kubeadm=periodic",
-      "--kubernetes-anywhere-kubelet-ci-version=latest-1.8",
-      "--kubernetes-anywhere-kubernetes-version=latest-1.8",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.8",
+      "--kubernetes-anywhere-kubernetes-version=latest-bazel-1.8",
       "--kubernetes-anywhere-upgrade-method=upgrade",
       "--provider=kubernetes-anywhere",
       "--skew",
@@ -10965,11 +10965,11 @@
       "--deployment=kubernetes-anywhere",
       "--env-file=jobs/platform/gce.env",
       "--extract=release/latest-1.10",
-      "--extract=ci/latest-1.9",
+      "--extract=ci/latest-bazel-1.9",
       "--gcp-zone=us-central1-f",
       "--kubeadm=periodic",
-      "--kubernetes-anywhere-kubelet-ci-version=latest-1.9",
-      "--kubernetes-anywhere-kubernetes-version=latest-1.9",
+      "--kubernetes-anywhere-kubelet-ci-version=latest-bazel-1.9",
+      "--kubernetes-anywhere-kubernetes-version=latest-bazel-1.9",
       "--kubernetes-anywhere-upgrade-method=upgrade",
       "--provider=kubernetes-anywhere",
       "--skew",