Skip to content

Commit

Permalink
Retire GCI jobs and the project pool
Browse files Browse the repository at this point in the history
They have all been migrated.
  • Loading branch information
wonderfly committed Jul 14, 2018
1 parent 842bb38 commit ef05992
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 187 deletions.
2 changes: 1 addition & 1 deletion boskos/janitor/deployment.yaml
Expand Up @@ -49,7 +49,7 @@ spec:
image: gcr.io/k8s-testimages/janitor:v20180619-83c62c891
args:
- --service-account=/etc/service-account/service-account.json
- --resource-type=gce-project,gci-qa-project,gpu-project,ingress-project,istio-project
- --resource-type=gce-project,gpu-project,ingress-project,istio-project
- --pool-size=20
volumeMounts:
- mountPath: /etc/service-account
Expand Down
2 changes: 1 addition & 1 deletion boskos/metrics/deployment.yaml
Expand Up @@ -48,7 +48,7 @@ spec:
- name: metrics
image: gcr.io/k8s-testimages/metrics:v20180604-ea866c2e8
args:
- --resource-type=gce-project,gke-project,gci-qa-project,gpu-project,ingress-project,istio-project
- --resource-type=gce-project,gke-project,gpu-project,ingress-project,istio-project
ports:
- containerPort: 8080
protocol: TCP
2 changes: 1 addition & 1 deletion boskos/reaper/deployment.yaml
Expand Up @@ -17,4 +17,4 @@ spec:
- name: boskos-reaper
image: gcr.io/k8s-testimages/reaper:v20180402-43203f868
args:
- --resource-type=gce-project,gke-project,gci-qa-project,gpu-project,ingress-project,istio-project
- --resource-type=gce-project,gke-project,gpu-project,ingress-project,istio-project
8 changes: 0 additions & 8 deletions boskos/resources.yaml
Expand Up @@ -461,14 +461,6 @@ resources:
- kubernetes-petset
state: dirty
type: gce-project
- names:
- k8s-gci-boskos-16
- k8s-gci-boskos-17
- k8s-gci-boskos-18
- k8s-gci-boskos-19
- k8s-gci-boskos-20
state: dirty
type: gci-qa-project
- names:
- k8s-gke-gpu-boskos-02
- k8s-gke-gpu-boskos-03
Expand Down
80 changes: 0 additions & 80 deletions jobs/config.json
Expand Up @@ -2942,86 +2942,6 @@
"sig-cluster-lifecycle"
]
},
"ci-kubernetes-e2e-gce-gci-qa-m65": {
"args": [
"--check-leaked-resources",
"--extract=gci/gci-65/latest-1.8",
"--gcp-project-type=gci-qa-project",
"--gcp-zone=us-central1-f",
"--ginkgo-parallel=25",
"--provider=gce",
"--test_args=--ginkgo.skip=\\[Slow\\]|\\[Serial\\]|\\[Disruptive\\]|\\[Flaky\\]|\\[Feature:.+\\] --minStartupPods=8",
"--timeout=50m"
],
"scenario": "kubernetes_e2e",
"sigOwners": [
"sig-gcp"
]
},
"ci-kubernetes-e2e-gce-gci-qa-m66": {
"args": [
"--check-leaked-resources",
"--extract=gci/gci-66/latest-1.9",
"--gcp-project-type=gci-qa-project",
"--gcp-zone=us-central1-f",
"--ginkgo-parallel=25",
"--provider=gce",
"--test_args=--ginkgo.skip=\\[Slow\\]|\\[Serial\\]|\\[Disruptive\\]|\\[Flaky\\]|\\[Feature:.+\\] --minStartupPods=8",
"--timeout=50m"
],
"scenario": "kubernetes_e2e",
"sigOwners": [
"sig-gcp"
]
},
"ci-kubernetes-e2e-gce-gci-qa-m67": {
"args": [
"--check-leaked-resources",
"--extract=gci/gci-67",
"--gcp-project-type=gci-qa-project",
"--gcp-zone=us-central1-f",
"--ginkgo-parallel=25",
"--provider=gce",
"--test_args=--ginkgo.skip=\\[Slow\\]|\\[Serial\\]|\\[Disruptive\\]|\\[Flaky\\]|\\[Feature:.+\\] --minStartupPods=8",
"--timeout=50m"
],
"scenario": "kubernetes_e2e",
"sigOwners": [
"sig-gcp"
]
},
"ci-kubernetes-e2e-gce-gci-qa-m68": {
"args": [
"--check-leaked-resources",
"--extract=gci/gci-68",
"--gcp-project-type=gci-qa-project",
"--gcp-zone=us-central1-f",
"--ginkgo-parallel=25",
"--provider=gce",
"--test_args=--ginkgo.skip=\\[Slow\\]|\\[Serial\\]|\\[Disruptive\\]|\\[Flaky\\]|\\[Feature:.+\\]",
"--timeout=50m"
],
"scenario": "kubernetes_e2e",
"sigOwners": [
"sig-gcp"
]
},
"ci-kubernetes-e2e-gce-gci-qa-master": {
"args": [
"--check-leaked-resources",
"--extract=gci/gci-canary",
"--gcp-project-type=gci-qa-project",
"--gcp-zone=us-central1-f",
"--ginkgo-parallel=25",
"--provider=gce",
"--test_args=--ginkgo.skip=\\[Slow\\]|\\[Serial\\]|\\[Disruptive\\]|\\[Flaky\\]|\\[Feature:.+\\] --minStartupPods=8",
"--timeout=50m"
],
"scenario": "kubernetes_e2e",
"sigOwners": [
"sig-gcp"
]
},
"ci-kubernetes-e2e-gce-gci-serial-sig-cli": {
"args": [
"--check-leaked-resources",
Expand Down
65 changes: 0 additions & 65 deletions prow/config.yaml
Expand Up @@ -6298,71 +6298,6 @@ periodics:
- --bare
image: gcr.io/k8s-testimages/kubekins-e2e:v20180706-944ac61f8-master

- interval: 30m
agent: kubernetes
name: ci-kubernetes-e2e-gce-gci-qa-m65
labels:
preset-service-account: "true"
preset-k8s-ssh: "true"
spec:
containers:
- args:
- --timeout=70
- --bare
image: gcr.io/k8s-testimages/kubekins-e2e:v20180706-944ac61f8-master

- interval: 30m
agent: kubernetes
name: ci-kubernetes-e2e-gce-gci-qa-m66
labels:
preset-service-account: "true"
preset-k8s-ssh: "true"
spec:
containers:
- args:
- --timeout=70
- --bare
image: gcr.io/k8s-testimages/kubekins-e2e:v20180706-944ac61f8-master

- interval: 30m
agent: kubernetes
name: ci-kubernetes-e2e-gce-gci-qa-m67
labels:
preset-service-account: "true"
preset-k8s-ssh: "true"
spec:
containers:
- args:
- --timeout=70
- --bare
image: gcr.io/k8s-testimages/kubekins-e2e:v20180706-944ac61f8-master

- interval: 30m
agent: kubernetes
name: ci-kubernetes-e2e-gce-gci-qa-m68
labels:
preset-service-account: "true"
preset-k8s-ssh: "true"
spec:
containers:
- args:
- --timeout=70
- --bare
image: gcr.io/k8s-testimages/kubekins-e2e:v20180706-944ac61f8-master

- interval: 30m
agent: kubernetes
name: ci-kubernetes-e2e-gce-gci-qa-master
labels:
preset-service-account: "true"
preset-k8s-ssh: "true"
spec:
containers:
- args:
- --timeout=70
- --bare
image: gcr.io/k8s-testimages/kubekins-e2e:v20180706-944ac61f8-master

- interval: 2h
agent: kubernetes
name: ci-kubernetes-e2e-gce-gci-serial-sig-cli
Expand Down
33 changes: 2 additions & 31 deletions testgrid/config.yaml
Expand Up @@ -356,16 +356,6 @@ test_groups:
gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gci-gce-flaky
- name: ci-kubernetes-e2e-gci-gce
gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gci-gce
- name: ci-kubernetes-e2e-gce-gci-qa-m65
gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-gci-qa-m65
- name: ci-kubernetes-e2e-gce-gci-qa-m66
gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-gci-qa-m66
- name: ci-kubernetes-e2e-gce-gci-qa-m67
gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-gci-qa-m67
- name: ci-kubernetes-e2e-gce-gci-qa-m68
gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-gci-qa-m68
- name: ci-kubernetes-e2e-gce-gci-qa-master
gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-gci-qa-master
- name: ci-kubernetes-e2e-gci-gce-scalability
gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gci-gce-scalability
num_failures_to_alert: 1
Expand Down Expand Up @@ -3293,26 +3283,6 @@ dashboards:
- name: kops-gce-ha
test_group_name: ci-kubernetes-e2e-kops-gce-ha

# "google-gci-dev" is a tab for tests that are used for GCI(aka COS) image
# development and qualification. It should not be confused with the "google-gci"
# tab that is for k8s development and release qualification.
# If you are going to make a change here, kindly cc @kubernetes/goog-image.
- name: google-gci-dev
dashboard_tab:
- name: qa-m65
test_group_name: ci-kubernetes-e2e-gce-gci-qa-m65
- name: qa-m66
test_group_name: ci-kubernetes-e2e-gce-gci-qa-m66
- name: qa-m67
test_group_name: ci-kubernetes-e2e-gce-gci-qa-m67
- name: qa-m68
test_group_name: ci-kubernetes-e2e-gce-gci-qa-m68
- name: qa-master
test_group_name: ci-kubernetes-e2e-gce-gci-qa-master
- name: ci-gke-master
test_group_name: ci-kubernetes-e2e-gke-gci-ci-master
# END google-gci-dev

- name: google-gci
dashboard_tab:
- name: gci-gce
Expand All @@ -3325,6 +3295,8 @@ dashboards:
test_group_name: ci-kubernetes-e2e-gci-gce-serial
- name: slow
test_group_name: ci-kubernetes-e2e-gci-gce-slow
- name: ci-gke-master
test_group_name: ci-kubernetes-e2e-gke-gci-ci-master

- name: google-gke
dashboard_tab:
Expand Down Expand Up @@ -6441,7 +6413,6 @@ dashboard_groups:
- google-aws
- google-gce
- google-gci
- google-gci-dev
- google-gce-compute-image-tools
- google-gke
- google-gke-staging
Expand Down

0 comments on commit ef05992

Please sign in to comment.