Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delete gce-1.4 to latest kubectl skew tests that never pass #2729

Merged
merged 2 commits into from
May 12, 2017
Merged

Delete gce-1.4 to latest kubectl skew tests that never pass #2729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da05270
Delete gce-1.4 to latest kubectl skew tests that never pass
fejta May 11, 2017
411ac28
Expect newline at end of json file
fejta May 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jenkins/bootstrap_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
14 changes: 0 additions & 14 deletions jenkins/job-configs/kubernetes-jenkins/bootstrap-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions jobs/ci-kubernetes-e2e-gce-latest-1.4-latest-cvm-kubectl-skew.env
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions jobs/ci-kubernetes-e2e-gce-latest-1.4-latest-gci-kubectl-skew.env
View file
Open in desktop

This file was deleted.

16 changes: 1 addition & 15 deletions jobs/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -2868,4 +2854,4 @@
],
"scenario": "kubernetes_verify"
}
}
}
1 change: 1 addition & 0 deletions jobs/config_sort.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__':
Expand Down
8 changes: 0 additions & 8 deletions testgrid/config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down