Merge pull request kubernetes#2959 from fejta/published

Migrate jobs to --skew and --extract=JENKINS_PUBLISHED_VERSION

jenkins/bootstrap_test.py

@@ -2106,6 +2106,10 @@ def test_envs_no_export(self):
                     ('FEDERATION_DOWN=', '--down=true|false'),
                     ('FEDERATION_UP=', '--up=true|false'),
                     ('JENKINS_FEDERATION_PREFIX=', '--stage=gs://FOO'),
+                    ('JENKINS_PUBLISHED_VERSION=', '--extract=V'),
+                    ('JENKINS_PUBLISHED_SKEW_VERSION=', '--extract=V'),
+                    ('JENKINS_USE_SKEW_KUBECTL=', 'SKEW_KUBECTL=y'),
+                    ('JENKINS_USE_SKEW_TESTS=', '--skew'),
                     ('JENKINS_SOAK_MODE', '--soak'),
                     ('JENKINS_SOAK_PREFIX', '--stage=gs://FOO'),
                     ('JENKINS_USE_EXISTING_BINARIES=', '--extract=local'),
@@ -2118,6 +2122,8 @@ def test_envs_no_export(self):
                     ('USE_KUBEMARK=', '--kubemark'),
                 ]
                 for env, fix in black:
+                    if 'JENKINS_PUBLISHED_VERSION' in env and 'kops' in job:
+                        continue  # TOOD(fejta): migrate kops jobs
                     if env in line:
                         self.fail('[%s]: Env %s: Convert %s to use %s in jobs/config.json' % (
                             job, line, env, fix))
@@ -2180,10 +2186,13 @@ def test_valid_job_envs(self):
                                 'Job %r, --cluster should be 20 chars or fewer' % job
                                 )
                 if config[job]['scenario'] == 'kubernetes_e2e':
+                    args = config[job]['args']
+                    if not any('--extract=' in a for a in args):
+                        self.fail('e2e job needs --extract flag: %s %s' % (job, args))
                     self.assertTrue(has_matching_env, job)
                     self.assertTrue(right_mode, job)
                     if job.startswith('pull-kubernetes-'):
-                        self.assertIn('--cluster=', config[job]['args'])
+                        self.assertIn('--cluster=', args)
                         if 'gke' in job:
                             stage = 'gs://kubernetes-release-dev/ci'
                             suffix = True
@@ -2194,12 +2203,11 @@ def test_valid_job_envs(self):
                         else:
                             stage = 'gs://kubernetes-release-pull/ci/%s' % job
                             suffix = False
-                        self.assertIn(
-                            '--stage=%s' % stage, config[job]['args'])
+                        self.assertIn('--stage=%s' % stage, args)
                         self.assertEquals(
                             suffix,
-                            any('--stage-suffix=' in a for a in config[job]['args']),
-                            ('--stage-suffix=', suffix, job, config[job]['args']))
+                            any('--stage-suffix=' in a for a in args),
+                            ('--stage-suffix=', suffix, job, args))
 
     def test_config_is_sorted(self):
         """Test jobs/config.json is sorted."""

jenkins/e2e-image/e2e-runner.sh

@@ -47,31 +47,6 @@ e2e_go_args=( \
   --dump="${ARTIFACTS}" \
 )
 
-# Allow download & unpack of alternate version of tests, for cross-version & upgrade testing.
-#
-# JENKINS_PUBLISHED_SKEW_VERSION adds a second --extract before the other one.
-# The JENKINS_PUBLISHED_SKEW_VERSION extracts to kubernetes_skew.
-# The JENKINS_PUBLISHED_VERSION extracts to kubernetes.
-#
-# For upgrades, PUBLISHED_SKEW should be a new release than PUBLISHED.
-if [[ -n "${JENKINS_PUBLISHED_SKEW_VERSION:-}" ]]; then
-  e2e_go_args+=(--extract="${JENKINS_PUBLISHED_SKEW_VERSION}")
-  # Assume JENKINS_USE_SKEW_KUBECTL == true for backward compatibility
-  : ${JENKINS_USE_SKEW_KUBECTL:=true}
-  if [[ "${JENKINS_USE_SKEW_TESTS:-}" == "true" ]]; then
-    e2e_go_args+=(--skew)  # Get kubectl as well as test code from kubernetes_skew
-  elif [[ "${JENKINS_USE_SKEW_KUBECTL}" == "true" ]]; then
-    # Append kubectl-path of skewed kubectl to test args, since we always
-    # want that to use the skewed kubectl version:
-    #  - for upgrade jobs, we want kubectl to be at the same version as
-    #    master.
-    #  - for client skew tests, we want to use the skewed kubectl
-    #    (that's what we're testing).
-    GINKGO_TEST_ARGS="${GINKGO_TEST_ARGS:-} --kubectl-path=$(pwd)/kubernetes_skew/cluster/kubectl.sh"
-  fi
-fi
-
-
 # We get the Kubernetes tarballs unless we are going to use old ones
 if [[ -n "${RAW_EXTRACT:-}" ]]; then
   echo 'RAW_EXTRACT is set, --extract set by $@'
@@ -93,9 +68,9 @@ elif [[ "${JENKINS_USE_GCI_VERSION:-}" =~ ^[yY]$ ]]; then
   echo 'Send --extract=gci/FAMILY to scenarios/kubernetes_e2e.py'
   exit 1
 else
-  # use JENKINS_PUBLISHED_VERSION, default to 'ci/latest', since that's
-  # usually what we're testing.
-  e2e_go_args+=(--extract="${JENKINS_PUBLISHED_VERSION:-ci/latest}")
+  echo 'ERROR: RAW_EXTRACT is unset. Please set to signal --extract set by $@'
+  echo 'This requirement will disappear after migration to --extract is finished'
+  exit 1
 fi
 
 if [[ "${FAIL_ON_GCP_RESOURCE_LEAK:-true}" == "true" ]]; then
@@ -108,6 +83,9 @@ fi
 
 if [[ "${E2E_TEST:-}" == "true" ]]; then
   e2e_go_args+=(--test)
+  if [[ "${SKEW_KUBECTL:-}" == 'y' ]]; then
+      GINKGO_TEST_ARGS="${GINKGO_TEST_ARGS:-} --kubectl-path=$(pwd)/kubernetes_skew/cluster/kubectl.sh"
+  fi
   if [[ -n "${GINKGO_TEST_ARGS:-}" ]]; then
     e2e_go_args+=(--test_args="${GINKGO_TEST_ARGS}")
   fi

jobs/ci-kubernetes-e2e-aws-release-1.5.env

@@ -15,6 +15,5 @@ GINKGO_PARALLEL=y
 # expected empty
 
 ### job-env
-JENKINS_PUBLISHED_VERSION=ci/latest-1.5
 GINKGO_TEST_ARGS=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[HPA\]|NodeProblemDetector
 

jobs/ci-kubernetes-e2e-cos-docker-validation-serial.env

@@ -1,8 +1,5 @@
-# Use GCI builtin k8s version.
-
 ### job-env
 KUBE_OS_DISTRIBUTION=gci
 GINKGO_TEST_ARGS=--ginkgo.focus=\[Serial\]|\[Disruptive\] --ginkgo.skip=\[Flaky\]|\[Feature:.+\]
 PROJECT=e2e-cos-docker-val-serial
 JENKINS_GCI_PATCH_K8S=n
-

jobs/ci-kubernetes-e2e-cos-docker-validation-slow.env

@@ -1,5 +1,3 @@
-# Use GCI builtin k8s version.
-
 ### job-env
 KUBE_OS_DISTRIBUTION=gci
 GINKGO_TEST_ARGS=--ginkgo.focus=\[Slow\] --ginkgo.skip=\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]

jobs/ci-kubernetes-e2e-cos-docker-validation.env

@@ -1,9 +1,6 @@
-# Use GCI builtin k8s version.
-
 ### job-env
 KUBE_OS_DISTRIBUTION=gci
 GINKGO_TEST_ARGS=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]
 GINKGO_PARALLEL=y
 PROJECT=e2e-cos-docker-val
 JENKINS_GCI_PATCH_K8S=n
-

jobs/ci-kubernetes-e2e-gce-1-6-master-upgrade-cluster-new.env

@@ -5,9 +5,6 @@ E2E_OPT=--check_version_skew=false
 E2E_UPGRADE_TEST=true
 STORAGE_MEDIA_TYPE=application/vnd.kubernetes.protobuf
 GINKGO_UPGRADE_TEST_ARGS=--ginkgo.focus=\[Feature:ClusterUpgrade\] --upgrade-target=ci/latest
-JENKINS_PUBLISHED_SKEW_VERSION=ci/latest
-JENKINS_PUBLISHED_VERSION=ci/latest-1.6
-JENKINS_USE_SKEW_TESTS=true
 KUBE_NODE_OS_DISTRIBUTION=debian
 PROJECT=gce-up-c1-3-g1-4-up-clu-n
 

jobs/ci-kubernetes-e2e-gce-1-6-master-upgrade-cluster.env

@@ -5,8 +5,8 @@ E2E_OPT=--check_version_skew=false
 E2E_UPGRADE_TEST=true
 STORAGE_MEDIA_TYPE=application/vnd.kubernetes.protobuf
 GINKGO_UPGRADE_TEST_ARGS=--ginkgo.focus=\[Feature:ClusterUpgrade\] --upgrade-target=ci/latest
-JENKINS_PUBLISHED_SKEW_VERSION=ci/latest
-JENKINS_PUBLISHED_VERSION=ci/latest-1.6
 KUBE_NODE_OS_DISTRIBUTION=debian
 PROJECT=gce-up-c1-3-g1-4-up-clu
 
+
+SKEW_KUBECTL=y

jobs/ci-kubernetes-e2e-gce-1-6-master-upgrade-master.env

@@ -5,8 +5,8 @@ E2E_OPT=--check_version_skew=false
 E2E_UPGRADE_TEST=true
 STORAGE_MEDIA_TYPE=application/vnd.kubernetes.protobuf
 GINKGO_UPGRADE_TEST_ARGS=--ginkgo.focus=\[Feature:MasterUpgrade\] --upgrade-target=ci/latest
-JENKINS_PUBLISHED_SKEW_VERSION=ci/latest
-JENKINS_PUBLISHED_VERSION=ci/latest-1.6
 KUBE_NODE_OS_DISTRIBUTION=debian
 PROJECT=gce-up-c1-3-g1-4-up-mas
 
+
+SKEW_KUBECTL=y

jobs/ci-kubernetes-e2e-gce-1.5-1.6-cvm-kubectl-skew.env

@@ -1,11 +1,11 @@
 E2E_OPT=--check_version_skew=false
 GINKGO_PARALLEL=y
 GINKGO_TEST_ARGS=--ginkgo.focus=Kubectl
-JENKINS_PUBLISHED_SKEW_VERSION=ci/latest-1.6
-JENKINS_PUBLISHED_VERSION=ci/latest-1.5
 PROJECT=k8s-gce-cvm-1-5-1-6-ctl-skew
 KUBE_NODE_OS_DISTRIBUTION=debian
 
 
 # Enable when testing upgrades from a version < 1.6 to a version >= 1.6
 ENABLE_LEGACY_ABAC=true
+
+SKEW_KUBECTL=y

jobs/ci-kubernetes-e2e-gce-1.5-1.6-gci-kubectl-skew.env

@@ -1,11 +1,11 @@
 E2E_OPT=--check_version_skew=false
 GINKGO_PARALLEL=y
 GINKGO_TEST_ARGS=--ginkgo.focus=Kubectl
-JENKINS_PUBLISHED_SKEW_VERSION=ci/latest-1.6
-JENKINS_PUBLISHED_VERSION=ci/latest-1.5
 PROJECT=k8s-gce-gci-1-5-1-6-ctl-skew
 KUBE_NODE_OS_DISTRIBUTION=gci
 
 
 # Enable when testing upgrades from a version < 1.6 to a version >= 1.6
 ENABLE_LEGACY_ABAC=true
+
+SKEW_KUBECTL=y

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

@@ -4,9 +4,6 @@ E2E_OPT=--check_version_skew=false
 E2E_UPGRADE_TEST=true
 STORAGE_MEDIA_TYPE=application/vnd.kubernetes.protobuf
 GINKGO_UPGRADE_TEST_ARGS=--ginkgo.focus=\[Feature:ClusterUpgrade\] --upgrade-target=ci/latest-1.6
-JENKINS_PUBLISHED_SKEW_VERSION=ci/latest-1.6
-JENKINS_PUBLISHED_VERSION=ci/latest-1.5
-JENKINS_USE_SKEW_TESTS=true
 KUBE_NODE_OS_DISTRIBUTION=debian
 PROJECT=k8s-gce-upg-1-5-1-6-up-clu-n
 

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

@@ -4,11 +4,11 @@ E2E_OPT=--check_version_skew=false
 E2E_UPGRADE_TEST=true
 STORAGE_MEDIA_TYPE=application/vnd.kubernetes.protobuf
 GINKGO_UPGRADE_TEST_ARGS=--ginkgo.focus=\[Feature:ClusterUpgrade\] --upgrade-target=ci/latest-1.6
-JENKINS_PUBLISHED_SKEW_VERSION=ci/latest-1.6
-JENKINS_PUBLISHED_VERSION=ci/latest-1.5
 KUBE_NODE_OS_DISTRIBUTION=debian
 PROJECT=k8s-gce-upg-1-5-1-6-up-clu
 
 
 # Enable when testing upgrades from a version < 1.6 to a version >= 1.6
 ENABLE_LEGACY_ABAC=true
+
+SKEW_KUBECTL=y

jobs/ci-kubernetes-e2e-gce-1.5-1.6-upgrade-master.env

@@ -4,11 +4,11 @@ E2E_OPT=--check_version_skew=false
 E2E_UPGRADE_TEST=true
 STORAGE_MEDIA_TYPE=application/vnd.kubernetes.protobuf
 GINKGO_UPGRADE_TEST_ARGS=--ginkgo.focus=\[Feature:MasterUpgrade\] --upgrade-target=ci/latest-1.6
-JENKINS_PUBLISHED_SKEW_VERSION=ci/latest-1.6
-JENKINS_PUBLISHED_VERSION=ci/latest-1.5
 KUBE_NODE_OS_DISTRIBUTION=debian
 PROJECT=k8s-gce-upg-1-5-1-6-up-mas
 
 
 # Enable when testing upgrades from a version < 1.6 to a version >= 1.6
 ENABLE_LEGACY_ABAC=true
+
+SKEW_KUBECTL=y

jobs/ci-kubernetes-e2e-gce-1.6-1.5-cvm-kubectl-skew.env

@@ -1,11 +1,8 @@
 E2E_OPT=--check_version_skew=false
 GINKGO_PARALLEL=y
 GINKGO_TEST_ARGS=--ginkgo.focus=Kubectl
-JENKINS_PUBLISHED_SKEW_VERSION=ci/latest-1.5
-JENKINS_PUBLISHED_VERSION=ci/latest-1.6
 PROJECT=k8s-gce-cvm-1-6-1-5-ctl-skew
 KUBE_NODE_OS_DISTRIBUTION=debian
 
 ### version-env
-JENKINS_USE_SKEW_TESTS=true
 

jobs/ci-kubernetes-e2e-gce-1.6-1.5-downgrade-cluster.env

@@ -4,10 +4,6 @@ E2E_OPT=--check_version_skew=false
 KUBE_NODE_OS_DISTRIBUTION=debian
 PROJECT=k8s-gce-dg-1-6-1-5-dwngr-clu
 
-JENKINS_PUBLISHED_VERSION=ci/latest-1.6
-JENKINS_PUBLISHED_SKEW_VERSION=ci/latest-1.5
-JENKINS_USE_SKEW_KUBECTL=false
-JENKINS_USE_SKEW_TESTS=false
 
 # Make sure we set up etcd with json storage. Rolling back from proto
 # (default for 1.6) is not possible. This is specific to the 1.6 to

jobs/ci-kubernetes-e2e-gce-1.6-1.5-gci-kubectl-skew.env

@@ -1,11 +1,8 @@
 E2E_OPT=--check_version_skew=false
 GINKGO_PARALLEL=y
 GINKGO_TEST_ARGS=--ginkgo.focus=Kubectl
-JENKINS_PUBLISHED_SKEW_VERSION=ci/latest-1.5
-JENKINS_PUBLISHED_VERSION=ci/latest-1.6
 PROJECT=k8s-gce-gci-1-6-1-5-ctl-skew
 KUBE_NODE_OS_DISTRIBUTION=gci
 
 ### version-env
-JENKINS_USE_SKEW_TESTS=true
 

jobs/ci-kubernetes-e2e-gce-1.6-master-cvm-kubectl-skew-serial.env

@@ -1,8 +1,8 @@
 E2E_OPT=--check_version_skew=false
 GINKGO_PARALLEL=n
 GINKGO_TEST_ARGS=--ginkgo.focus=Kubectl.*\[Serial\]
-JENKINS_PUBLISHED_SKEW_VERSION=ci/latest
-JENKINS_PUBLISHED_VERSION=ci/latest-1.6
 PROJECT=k8s-gce-cvm-1-6-m-ctl-skw-srl
 KUBE_NODE_OS_DISTRIBUTION=debian
 
+
+SKEW_KUBECTL=y

jobs/ci-kubernetes-e2e-gce-1.6-master-cvm-kubectl-skew.env

@@ -1,8 +1,8 @@
 E2E_OPT=--check_version_skew=false
 GINKGO_PARALLEL=y
 GINKGO_TEST_ARGS=--ginkgo.focus=Kubectl --ginkgo.skip=\[Serial\]
-JENKINS_PUBLISHED_SKEW_VERSION=ci/latest
-JENKINS_PUBLISHED_VERSION=ci/latest-1.6
 PROJECT=k8s-gce-cvm-1-6-mstr-ctl-skew
 KUBE_NODE_OS_DISTRIBUTION=debian
 
+
+SKEW_KUBECTL=y

jobs/ci-kubernetes-e2e-gce-1.6-master-gci-kubectl-skew-serial.env

@@ -1,8 +1,8 @@
 E2E_OPT=--check_version_skew=false
 GINKGO_PARALLEL=n
 GINKGO_TEST_ARGS=--ginkgo.focus=Kubectl.*\[Serial\]
-JENKINS_PUBLISHED_SKEW_VERSION=ci/latest
-JENKINS_PUBLISHED_VERSION=ci/latest-1.6
 PROJECT=k8s-gce-gci-1-6-m-ctl-skw-srl
 KUBE_NODE_OS_DISTRIBUTION=gci
 
+
+SKEW_KUBECTL=y

jobs/ci-kubernetes-e2e-gce-1.6-master-gci-kubectl-skew.env

@@ -1,8 +1,8 @@
 E2E_OPT=--check_version_skew=false
 GINKGO_PARALLEL=y
 GINKGO_TEST_ARGS=--ginkgo.focus=Kubectl --ginkgo.skip=\[Serial\]
-JENKINS_PUBLISHED_SKEW_VERSION=ci/latest
-JENKINS_PUBLISHED_VERSION=ci/latest-1.6
 PROJECT=k8s-gce-gci-1-6-mstr-ctl-skew
 KUBE_NODE_OS_DISTRIBUTION=gci
 
+
+SKEW_KUBECTL=y

jobs/ci-kubernetes-e2e-gce-alpha-features-release-1-4.env

@@ -1,6 +1,5 @@
 ### job-env
 KUBE_FEATURE_GATES=AllAlpha=true
-JENKINS_PUBLISHED_VERSION=ci/latest-1.4
 GINKGO_TEST_ARGS=--ginkgo.focus=\[Feature:(ExternalTrafficLocalOnly|PetSet|DynamicKubeletConfig)\]|ScheduledJob
 PROJECT=k8s-jkns-e2e-gce-alpha1-4
 KUBE_NODE_OS_DISTRIBUTION=debian

jobs/ci-kubernetes-e2e-gce-alpha-features-release-1-5.env

@@ -1,6 +1,5 @@
 ### job-env
 KUBE_FEATURE_GATES=AllAlpha=true
-JENKINS_PUBLISHED_VERSION=ci/latest-1.5
 GINKGO_TEST_ARGS=--ginkgo.focus=\[Feature:(ExternalTrafficLocalOnly|DynamicKubeletConfig)\]|ScheduledJob
 PROJECT=k8s-e2e-gce-alpha1-5
 KUBE_NODE_OS_DISTRIBUTION=debian

jobs/ci-kubernetes-e2e-gce-alpha-features-release-1-6.env

@@ -1,6 +1,5 @@
 ### job-env
 KUBE_FEATURE_GATES=AllAlpha=true
-JENKINS_PUBLISHED_VERSION=ci/latest-1.6
 GINKGO_TEST_ARGS=--ginkgo.focus=\[Feature:(ExternalTrafficLocalOnly|DynamicKubeletConfig)\]|ScheduledJob
 PROJECT=k8s-jkns-gce-alpha-1-6
 KUBE_NODE_OS_DISTRIBUTION=debian

jobs/ci-kubernetes-e2e-gce-canary.env

@@ -8,6 +8,6 @@ CLOUDSDK_BUCKET=gs://cloud-sdk-testing/ci/staging
 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
+
+SKEW_KUBECTL=y

jobs/ci-kubernetes-e2e-gce-etcd2-release-1-6.env

@@ -1,5 +1,4 @@
 ### job-env
-JENKINS_PUBLISHED_VERSION=ci/latest-1.6
 GINKGO_TEST_ARGS=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]
 GINKGO_PARALLEL=y
 PROJECT=k8s-jkns-gce-etcd2-1-6

jobs/ci-kubernetes-e2e-gce-etcd3-release-1-5.env

@@ -1,5 +1,4 @@
 ### job-env
-JENKINS_PUBLISHED_VERSION=ci/latest-1.5
 GINKGO_TEST_ARGS=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]
 GINKGO_PARALLEL=y
 PROJECT=k8s-gce-etcd3-1-5

jobs/ci-kubernetes-e2e-gce-gci-1.5-rollback-etcd.env

@@ -11,8 +11,8 @@ STORAGE_MEDIA_TYPE=application/json
 E2E_OPT=--check_version_skew=false
 E2E_UPGRADE_TEST=true
 GINKGO_UPGRADE_TEST_ARGS=--ginkgo.focus=\[Feature:EtcdUpgrade\] --etcd-upgrade-storage=etcd2 --etcd-upgrade-version=2.2.1
-JENKINS_PUBLISHED_SKEW_VERSION=ci/latest-1.5
-JENKINS_PUBLISHED_VERSION=ci/latest-1.5
 KUBE_NODE_OS_DISTRIBUTION=gci
 PROJECT=gce-up-g1-5-rb-etcd
 
+
+SKEW_KUBECTL=y

jobs/ci-kubernetes-e2e-gce-gci-1.5-upgrade-etcd.env

@@ -11,8 +11,8 @@ STORAGE_MEDIA_TYPE=application/json
 E2E_OPT=--check_version_skew=false
 E2E_UPGRADE_TEST=true
 GINKGO_UPGRADE_TEST_ARGS=--ginkgo.focus=\[Feature:EtcdUpgrade\] --etcd-upgrade-storage=etcd3 --etcd-upgrade-version=3.0.17
-JENKINS_PUBLISHED_SKEW_VERSION=ci/latest-1.5
-JENKINS_PUBLISHED_VERSION=ci/latest-1.5
 KUBE_NODE_OS_DISTRIBUTION=gci
 PROJECT=gce-up-g1-5-up-etcd
 
+
+SKEW_KUBECTL=y

jobs/ci-kubernetes-e2e-gce-gci-ci-release-1.4.env

@@ -1,5 +1,4 @@
 ### job-env
-JENKINS_PUBLISHED_VERSION=ci/latest-1.4
 # To qualify GCI milestone 56 for k8s release-1.4.
 JENKINS_GCI_HEAD_IMAGE_FAMILY=gci-56
 GINKGO_TEST_ARGS=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]

jobs/ci-kubernetes-e2e-gce-gci-ci-release-1.5.env

@@ -1,5 +1,4 @@
 ### job-env
-JENKINS_PUBLISHED_VERSION=ci/latest-1.5
 JENKINS_GCI_HEAD_IMAGE_FAMILY=gci-56
 GINKGO_TEST_ARGS=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]
 GINKGO_PARALLEL=y

jobs/ci-kubernetes-e2e-gce-gci-ci-serial-release-1.4.env

@@ -1,5 +1,4 @@
 ### job-env
-JENKINS_PUBLISHED_VERSION=ci/latest-1.4
 # To qualify GCI milestone 56 for k8s release-1.4.
 JENKINS_GCI_HEAD_IMAGE_FAMILY=gci-56
 GINKGO_TEST_ARGS=--ginkgo.focus=\[Serial\]|\[Disruptive\] --ginkgo.skip=\[Flaky\]|\[Feature:.+\]