From da052703462ea69ea90ed725618b4237f7f4e5d4 Mon Sep 17 00:00:00 2001 From: Erick Fejta Date: Thu, 11 May 2017 13:29:07 -0700 Subject: [PATCH 1/2] Delete gce-1.4 to latest kubectl skew tests that never pass --- .../kubernetes-jenkins/bootstrap-ci.yaml | 14 -------------- ...2e-gce-latest-1.4-latest-cvm-kubectl-skew.env | 12 ------------ ...2e-gce-latest-1.4-latest-gci-kubectl-skew.env | 12 ------------ jobs/config.json | 16 +--------------- testgrid/config/config.yaml | 8 -------- 5 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 jobs/ci-kubernetes-e2e-gce-latest-1.4-latest-cvm-kubectl-skew.env delete mode 100644 jobs/ci-kubernetes-e2e-gce-latest-1.4-latest-gci-kubectl-skew.env diff --git a/jenkins/job-configs/kubernetes-jenkins/bootstrap-ci.yaml b/jenkins/job-configs/kubernetes-jenkins/bootstrap-ci.yaml index 3e9367312244..4f10a2eb83bb 100644 --- a/jenkins/job-configs/kubernetes-jenkins/bootstrap-ci.yaml +++ b/jenkins/job-configs/kubernetes-jenkins/bootstrap-ci.yaml @@ -1550,20 +1550,6 @@ frequency: 'H/5 * * * *' # At least every 30m trigger-job: '' - - kubernetes-e2e-gce-latest-1.4-latest-cvm-kubectl-skew: - job-name: ci-kubernetes-e2e-gce-latest-1.4-latest-cvm-kubectl-skew - jenkins-timeout: 240 - timeout: 140 - frequency: 'H H/6 * * *' # 4 times a day for older jobs. - trigger-job: '' - - kubernetes-e2e-gce-latest-1.4-latest-gci-kubectl-skew: - job-name: ci-kubernetes-e2e-gce-latest-1.4-latest-gci-kubectl-skew - jenkins-timeout: 240 - timeout: 140 - frequency: 'H H/6 * * *' # 4 times a day for older jobs. - trigger-job: '' - - ### kubernetes-e2e-upgrades-image-gke ### 1.4 to 1.5 GKE upgrade tests # cvm -> cvm diff --git a/jobs/ci-kubernetes-e2e-gce-latest-1.4-latest-cvm-kubectl-skew.env b/jobs/ci-kubernetes-e2e-gce-latest-1.4-latest-cvm-kubectl-skew.env deleted file mode 100644 index 503d9f8de7df..000000000000 --- a/jobs/ci-kubernetes-e2e-gce-latest-1.4-latest-cvm-kubectl-skew.env +++ /dev/null @@ -1,12 +0,0 @@ -E2E_OPT=--check_version_skew=false -GINKGO_PARALLEL=y -GINKGO_TEST_ARGS=--ginkgo.focus=Kubectl -JENKINS_PUBLISHED_SKEW_VERSION=ci/latest -JENKINS_PUBLISHED_VERSION=ci/latest-1.4 -PROJECT=gce-cvm-upg-1-4-lat-ctl-skew -KUBE_NODE_OS_DISTRIBUTION=debian - -KUBEKINS_TIMEOUT=120m - -# Enable when testing upgrades from a version < 1.6 to a version >= 1.6 -ENABLE_LEGACY_ABAC=true diff --git a/jobs/ci-kubernetes-e2e-gce-latest-1.4-latest-gci-kubectl-skew.env b/jobs/ci-kubernetes-e2e-gce-latest-1.4-latest-gci-kubectl-skew.env deleted file mode 100644 index 3b7cccdebfeb..000000000000 --- a/jobs/ci-kubernetes-e2e-gce-latest-1.4-latest-gci-kubectl-skew.env +++ /dev/null @@ -1,12 +0,0 @@ -E2E_OPT=--check_version_skew=false -GINKGO_PARALLEL=y -GINKGO_TEST_ARGS=--ginkgo.focus=Kubectl -JENKINS_PUBLISHED_SKEW_VERSION=ci/latest -JENKINS_PUBLISHED_VERSION=ci/latest-1.4 -PROJECT=gce-gci-upg-1-4-lat-ctl-skew -KUBE_NODE_OS_DISTRIBUTION=gci - -KUBEKINS_TIMEOUT=120m - -# Enable when testing upgrades from a version < 1.6 to a version >= 1.6 -ENABLE_LEGACY_ABAC=true diff --git a/jobs/config.json b/jobs/config.json index 28e72a12542e..584ad2ae00d2 100644 --- a/jobs/config.json +++ b/jobs/config.json @@ -562,20 +562,6 @@ ], "scenario": "kubernetes_e2e" }, - "ci-kubernetes-e2e-gce-latest-1.4-latest-cvm-kubectl-skew": { - "args": [ - "--env-file=platforms/gce.env", - "--env-file=jobs/ci-kubernetes-e2e-gce-latest-1.4-latest-cvm-kubectl-skew.env" - ], - "scenario": "kubernetes_e2e" - }, - "ci-kubernetes-e2e-gce-latest-1.4-latest-gci-kubectl-skew": { - "args": [ - "--env-file=platforms/gce.env", - "--env-file=jobs/ci-kubernetes-e2e-gce-latest-1.4-latest-gci-kubectl-skew.env" - ], - "scenario": "kubernetes_e2e" - }, "ci-kubernetes-e2e-gce-latest-1.5-latest-1.4-cvm-kubectl-skew": { "args": [ "--env-file=platforms/gce.env", @@ -2868,4 +2854,4 @@ ], "scenario": "kubernetes_verify" } -} \ No newline at end of file +} diff --git a/testgrid/config/config.yaml b/testgrid/config/config.yaml index 59200b818816..6f0e8a454176 100644 --- a/testgrid/config/config.yaml +++ b/testgrid/config/config.yaml @@ -486,10 +486,6 @@ test_groups: gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-latest-1.5-latest-1.4-cvm-kubectl-skew - name: ci-kubernetes-e2e-gce-latest-1.5-latest-1.4-gci-kubectl-skew gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-latest-1.5-latest-1.4-gci-kubectl-skew -- name: ci-kubernetes-e2e-gce-latest-1.4-latest-cvm-kubectl-skew - gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-latest-1.4-latest-cvm-kubectl-skew -- name: ci-kubernetes-e2e-gce-latest-1.4-latest-gci-kubectl-skew - gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-latest-1.4-latest-gci-kubectl-skew - name: ci-kubernetes-e2e-gce-latest-1.4-latest-1.5-cvm-kubectl-skew gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-latest-1.4-latest-1.5-cvm-kubectl-skew - name: ci-kubernetes-e2e-gce-latest-1.4-latest-1.5-gci-kubectl-skew @@ -1434,10 +1430,6 @@ dashboards: test_group_name: ci-kubernetes-e2e-gke-1.5-1.4-cvm-kubectl-skew - name: gke-1.5-1.4-gci test_group_name: ci-kubernetes-e2e-gke-1.5-1.4-gci-kubectl-skew - - name: gce-1.4-latest-cvm - test_group_name: ci-kubernetes-e2e-gce-latest-1.4-latest-cvm-kubectl-skew - - name: gce-1.4-latest-gci - test_group_name: ci-kubernetes-e2e-gce-latest-1.4-latest-gci-kubectl-skew - name: google-1.4-1.5-upgrade dashboard_tab: From 411ac287d4b9499e07be698b8251c0877661d504 Mon Sep 17 00:00:00 2001 From: Erick Fejta Date: Thu, 11 May 2017 13:31:20 -0700 Subject: [PATCH 2/2] Expect newline at end of json file --- jenkins/bootstrap_test.py | 2 +- jobs/config_sort.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/jenkins/bootstrap_test.py b/jenkins/bootstrap_test.py index 1c1b63fe65f7..8e4974b0bcae 100755 --- a/jenkins/bootstrap_test.py +++ b/jenkins/bootstrap_test.py @@ -2025,7 +2025,7 @@ def testConfigIsSorted(self): """Test jobs/config.json is sorted.""" with open(bootstrap.test_infra('jobs/config.json')) as fp: original = fp.read() - expect = json.dumps(json.loads(original), sort_keys=True, indent=2) + expect = json.dumps(json.loads(original), sort_keys=True, indent=2) + '\n' if original != expect: self.fail('config.json is not sorted, please run jobs/config_sort.py') diff --git a/jobs/config_sort.py b/jobs/config_sort.py index aa2f8b9ef86e..d9ff347f99af 100755 --- a/jobs/config_sort.py +++ b/jobs/config_sort.py @@ -31,6 +31,7 @@ def sort(): configs = json.loads(fp.read()) fp.seek(0) fp.write(json.dumps(configs, sort_keys=True, indent=2)) + fp.write('\n') fp.truncate() if __name__ == '__main__':