Convert ci-kubernetes-e2e-gce-1.4-1.5-upgrade jobs (#1847)

Author: xiangpengzhao

jenkins/bootstrap_test.py

@@ -1268,7 +1268,10 @@ def testBootstrapCIYaml(self):
             'kubernetes-e2e-gke-1.3-1.4-upgrade-master',
             'kubernetes-e2e-gce-1.3-1.4-upgrade-master',
             'kubernetes-e2e-gce-1.3-1.4-upgrade-cluster',
-            'kubernetes-e2e-gce-1.3-1.4-upgrade-cluster-new'
+            'kubernetes-e2e-gce-1.3-1.4-upgrade-cluster-new',
+            'kubernetes-e2e-gce-1.4-1.5-upgrade-master',
+            'kubernetes-e2e-gce-1.4-1.5-upgrade-cluster',
+            'kubernetes-e2e-gce-1.4-1.5-upgrade-cluster-new'
         ]
 
         blacklist = [

jenkins/job-configs/kubernetes-jenkins/bootstrap-ci.yaml

@@ -1467,21 +1467,21 @@
 
     - kubernetes-e2e-gce-1.4-1.5-upgrade-master:
         job-name: ci-kubernetes-e2e-gce-1.4-1.5-upgrade-master
-        timeout: 0
+        timeout: 620
         frequency: 'H/5 * * * *' # At least every 30m
-        json: 0
+        json: 1
         trigger-job: ''
     - kubernetes-e2e-gce-1.4-1.5-upgrade-cluster:
         job-name: ci-kubernetes-e2e-gce-1.4-1.5-upgrade-cluster
-        timeout: 0
+        timeout: 620
         frequency: 'H/5 * * * *' # At least every 30m
-        json: 0
+        json: 1
         trigger-job: ''
     - kubernetes-e2e-gce-1.4-1.5-upgrade-cluster-new:
         job-name: ci-kubernetes-e2e-gce-1.4-1.5-upgrade-cluster-new
-        timeout: 0
+        timeout: 620
         frequency: 'H/5 * * * *' # At least every 30m
-        json: 0
+        json: 1
         trigger-job: ''
 
     ### kubernetes-e2e-upgrades-gce-cross-image-and-gci #mtaufen

jobs/ci-kubernetes-e2e-gce-1.4-1.5-upgrade-cluster-new.env

@@ -0,0 +1,12 @@
+### job-env
+
+E2E_OPT=--check_version_skew=false
+E2E_UPGRADE_TEST=true
+GINKGO_UPGRADE_TEST_ARGS=--ginkgo.focus=\[Feature:ClusterUpgrade\] --upgrade-target=ci/latest-1.5
+JENKINS_PUBLISHED_SKEW_VERSION=ci/latest-1.5
+JENKINS_PUBLISHED_VERSION=ci/latest-1.4
+JENKINS_USE_SKEW_TESTS=true
+KUBE_NODE_OS_DISTRIBUTION=debian
+PROJECT=kube-gce-upg-1-4-1-5-upg-clu-n
+
+KUBEKINS_TIMEOUT=600m

jobs/ci-kubernetes-e2e-gce-1.4-1.5-upgrade-cluster-new.sh

@@ -0,0 +1,11 @@
+### job-env
+
+E2E_OPT=--check_version_skew=false
+E2E_UPGRADE_TEST=true
+GINKGO_UPGRADE_TEST_ARGS=--ginkgo.focus=\[Feature:ClusterUpgrade\] --upgrade-target=ci/latest-1.5
+JENKINS_PUBLISHED_SKEW_VERSION=ci/latest-1.5
+JENKINS_PUBLISHED_VERSION=ci/latest-1.4
+KUBE_NODE_OS_DISTRIBUTION=debian
+PROJECT=kube-gce-upg-1-4-1-5-upg-clu
+
+KUBEKINS_TIMEOUT=600m

jobs/ci-kubernetes-e2e-gce-1.4-1.5-upgrade-cluster.env

@@ -0,0 +1,11 @@
+### job-env
+
+E2E_OPT=--check_version_skew=false
+E2E_UPGRADE_TEST=true
+GINKGO_UPGRADE_TEST_ARGS=--ginkgo.focus=\[Feature:MasterUpgrade\] --upgrade-target=ci/latest-1.5
+JENKINS_PUBLISHED_SKEW_VERSION=ci/latest-1.5
+JENKINS_PUBLISHED_VERSION=ci/latest-1.4
+KUBE_NODE_OS_DISTRIBUTION=debian
+PROJECT=kube-gce-upg-1-4-1-5-upg-mas
+
+KUBEKINS_TIMEOUT=600m

jobs/ci-kubernetes-e2e-gce-1.4-1.5-upgrade-cluster.sh

@@ -2235,6 +2235,30 @@
     "--env-file=platforms/gce.env",
     "--env-file=jobs/ci-kubernetes-e2e-gce-1.3-1.4-upgrade-cluster-new.env"
   ]
+},
+
+"ci-kubernetes-e2e-gce-1.4-1.5-upgrade-master": {
+  "scenario": "kubernetes_e2e",
+  "args": [
+    "--env-file=platforms/gce.env",
+    "--env-file=jobs/ci-kubernetes-e2e-gce-1.4-1.5-upgrade-master.env"
+  ]
+},
+
+"ci-kubernetes-e2e-gce-1.4-1.5-upgrade-cluster": {
+  "scenario": "kubernetes_e2e",
+  "args": [
+    "--env-file=platforms/gce.env",
+    "--env-file=jobs/ci-kubernetes-e2e-gce-1.4-1.5-upgrade-cluster.env"
+  ]
+},
+
+"ci-kubernetes-e2e-gce-1.4-1.5-upgrade-cluster-new": {
+  "scenario": "kubernetes_e2e",
+  "args": [
+    "--env-file=platforms/gce.env",
+    "--env-file=jobs/ci-kubernetes-e2e-gce-1.4-1.5-upgrade-cluster-new.env"
+  ]
 }
 
 }