clean up pr-1.6 jobs

ustcliao · Jan 26, 2018 · 60e76ce · 60e76ce
1 parent d581817
commit 60e76ce
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 345 deletions.
diff --git a/jenkins/job-configs/kubernetes-jenkins-pull/bootstrap-pull-json.yaml b/jenkins/job-configs/kubernetes-jenkins-pull/bootstrap-pull-json.yaml
diff --git a/jenkins/job-configs/kubernetes-jenkins-pull/bootstrap-security-pull.yaml b/jenkins/job-configs/kubernetes-jenkins-pull/bootstrap-security-pull.yaml
diff --git a/jobs/config.json b/jobs/config.json
@@ -11623,11 +11623,8 @@
     ]
   },
   "pull-kubernetes-e2e-gce": {
-    "_comment1": "NOTE: THESE ARE THE JENKINS ARGS / COMMON ARGS (!)",
-    "_comment2": "PLEASE PUT ARGS THAT WILL WORK FOR 1.6 HERE",
-    "_comment3": "Args for 1.7+ should go in prow/config.yaml after the `--` !",
     "args": [
-      "--build",
+      "--build=bazel",
       "--cluster=",
       "--env-file=jobs/platform/gce.env",
       "--env-file=jobs/env/pull-kubernetes-e2e.env",
@@ -11637,8 +11634,8 @@
       "--gcp-project=k8s-jkns-pr-gce-etcd3",
       "--gcp-zone=us-central1-f",
       "--ginkgo-parallel=30",
-      "--mode=docker",
       "--provider=gce",
+      "--runtime-config=batch/v2alpha1=true,admissionregistration.k8s.io/v1alpha1=true",
       "--stage=gs://kubernetes-release-pull/ci/pull-kubernetes-e2e-gce",
       "--test_args=--ginkgo.skip=\\[Slow\\]|\\[Serial\\]|\\[Disruptive\\]|\\[Flaky\\]|\\[Feature:.+\\] --minStartupPods=8",
       "--timeout=65m"
@@ -11671,11 +11668,8 @@
     ]
   },
   "pull-kubernetes-e2e-gke": {
-    "_comment1": "NOTE: THESE ARE THE JENKINS ARGS / COMMON ARGS (!)",
-    "_comment2": "PLEASE PUT ARGS THAT WILL WORK FOR 1.6 HERE",
-    "_comment3": "Args for 1.7+ should go in prow/config.yaml after the `--` !",
     "args": [
-      "--build",
+      "--build=bazel",
       "--cluster=",
       "--deployment=gke",
       "--extract=local",
@@ -11686,7 +11680,6 @@
       "--ginkgo-parallel=30",
       "--gke-environment=test",
       "--gke-shape={\"default\":{\"Nodes\":4,\"MachineType\":\"n1-standard-2\"}}",
-      "--mode=docker",
       "--provider=gke",
       "--stage=gs://kubernetes-release-pull/ci/pull-kubernetes-e2e-gke",
       "--test_args=--ginkgo.flakeAttempts=2 --ginkgo.skip=\\[Slow\\]|\\[Serial\\]|\\[Disruptive\\]|\\[Flaky\\]|\\[Feature:.+\\] --minStartupPods=8",
@@ -11721,20 +11714,16 @@
     ]
   },
   "pull-kubernetes-e2e-kops-aws": {
-    "_comment1": "NOTE: THESE ARE THE JENKINS ARGS / COMMON ARGS (!)",
-    "_comment2": "PLEASE PUT ARGS THAT WILL WORK FOR 1.6 HERE",
-    "_comment3": "Args for 1.7+ should go in prow/config.yaml after the `--` !",
     "args": [
       "--aws",
       "--aws-cluster-domain=test-cncf-aws.k8s.io",
-      "--build",
+      "--build=bazel",
       "--check-leaked-resources=false",
       "--cluster=",
       "--env-file=jobs/platform/kops_aws.env",
       "--env-file=jobs/env/pull-kubernetes-e2e-kops-aws.env",
       "--extract=local",
       "--ginkgo-parallel",
-      "--mode=docker",
       "--provider=aws",
       "--stage=gs://kubernetes-release-pull/ci/pull-kubernetes-e2e-kops-aws",
       "--test_args=--ginkgo.flakeAttempts=2 --ginkgo.skip=\\[Slow\\]|\\[Serial\\]|\\[Disruptive\\]|\\[Flaky\\]|\\[Feature:.+\\]|\\[HPA\\]|Dashboard|Services.*functioning.*NodePort",
@@ -11786,11 +11775,8 @@
     ]
   },
   "pull-kubernetes-kubemark-e2e-gce": {
-    "_comment1": "NOTE: THESE ARE THE JENKINS ARGS / COMMON ARGS (!)",
-    "_comment2": "PLEASE PUT ARGS THAT WILL WORK FOR 1.6 HERE",
-    "_comment3": "Args for 1.7+ should go in prow/config.yaml after the `--` !",
     "args": [
-      "--build",
+      "--build=bazel",
       "--cluster=",
       "--env-file=jobs/platform/gce.env",
       "--env-file=jobs/env/pull-kubernetes-kubemark-e2e-gce.env",
@@ -11800,7 +11786,6 @@
       "--gcp-zone=us-central1-f",
       "--kubemark",
       "--kubemark-nodes=5",
-      "--mode=docker",
       "--provider=gce",
       "--stage=gs://kubernetes-release-pull/ci/pull-kubernetes-kubemark-e2e-gce",
       "--test=false",

diff --git a/jobs/config_test.py b/jobs/config_test.py
@@ -61,8 +61,6 @@ class JobTest(unittest.TestCase):
 
     yaml_suffix = {
         'jenkins/job-configs/bootstrap-maintenance.yaml' : 'suffix',
-        'jenkins/job-configs/kubernetes-jenkins-pull/bootstrap-pull-json.yaml' : 'jsonsuffix',
-        'jenkins/job-configs/kubernetes-jenkins-pull/bootstrap-security-pull.yaml' : 'suffix',
         'jenkins/job-configs/kubernetes-jenkins/bootstrap-ci-commit.yaml' : 'commit-suffix',
         'jenkins/job-configs/kubernetes-jenkins/bootstrap-ci-repo.yaml' : 'repo-suffix',
         'jenkins/job-configs/kubernetes-jenkins/bootstrap-ci-soak.yaml' : 'soak-suffix',
@@ -127,49 +125,6 @@ def check(job, name):
 
         self.check_bootstrap_yaml('jenkins/job-configs/bootstrap-maintenance.yaml', check)
 
-    def test_bootstrap_pull_json_yaml(self):
-        def check(job, name):
-            job_name = 'pull-%s' % name
-            self.assertIn('max-total', job)
-            self.assertIn('repo-name', job)
-            self.assertIn('.', job['repo-name'])  # Has domain
-            self.assertIn('timeout', job)
-            self.assertNotIn('json', job)
-            self.assertGreater(job['timeout'], 0)
-            return job_name
-
-        self.check_bootstrap_yaml(
-            'jenkins/job-configs/kubernetes-jenkins-pull/bootstrap-pull-json.yaml', check)
-
-    def test_bootstrap_security_pull(self):
-        def check(job, name):
-            job_name = 'pull-%s' % name
-            self.assertIn('max-total', job)
-            self.assertIn('repo-name', job)
-            self.assertIn('.', job['repo-name'])  # Has domain
-            self.assertIn('timeout', job)
-            self.assertNotIn('json', job)
-            self.assertGreater(job['timeout'], 0)
-            return job_name
-
-        self.check_bootstrap_yaml(
-            'jenkins/job-configs/kubernetes-jenkins-pull/bootstrap-security-pull.yaml', check)
-
-    def test_bootstrap_security_match(self):
-        json_jobs = self.load_bootstrap_yaml(
-            'jenkins/job-configs/kubernetes-jenkins-pull/bootstrap-pull-json.yaml')
-
-        sec_jobs = self.load_bootstrap_yaml(
-            'jenkins/job-configs/kubernetes-jenkins-pull/bootstrap-security-pull.yaml')
-        for name, job in sec_jobs.iteritems():
-            self.assertIn(name, json_jobs)
-            job2 = json_jobs[name]
-            for attr in job:
-                if attr == 'repo-name':
-                    continue
-                self.assertEquals(job[attr], job2[attr])
-
-
     def test_bootstrap_ci_commit_yaml(self):
         def check(job, name):
             job_name = 'ci-%s' % name