Skip to content

Commit 3482d54

Browse files
authored
Remove gcp-ha, gcp-crio, gcp-logging cluster profiles (openshift#53567)
* Remove gcp-ha * Remove gcp-crio * Remove gcp-logging * Remove gcp-ha-static
1 parent 238ffe7 commit 3482d54

16 files changed

Lines changed: 1 addition & 732 deletions

File tree

ci-operator/config/openshift/origin/openshift-origin-release-3.11.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,6 @@ tests:
159159
run-tests
160160
openshift_ansible:
161161
cluster_profile: gcp
162-
- as: e2e-gcp-crio
163-
commands: TEST_FOCUS=Suite:openshift/conformance/parallel TEST_FOCUS_SERIAL=Suite:openshift/conformance/serial/minimal
164-
run-tests
165-
openshift_ansible:
166-
cluster_profile: gcp-crio
167-
optional: true
168-
run_if_changed: ^(vendor/k8s.io/kubernetes/pkg/kubelet)
169162
zz_generated_metadata:
170163
branch: release-3.11
171164
org: openshift

ci-operator/jobs/openshift/origin/openshift-origin-release-3.11-presubmits.yaml

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -202,86 +202,6 @@ presubmits:
202202
secret:
203203
secretName: result-aggregator
204204
trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
205-
- agent: kubernetes
206-
always_run: false
207-
branches:
208-
- ^release-3\.11$
209-
- ^release-3\.11-
210-
cluster: build04
211-
context: ci/prow/e2e-gcp-crio
212-
decorate: true
213-
labels:
214-
ci.openshift.io/generator: prowgen
215-
pj-rehearse.openshift.io/can-be-rehearsed: "true"
216-
name: pull-ci-openshift-origin-release-3.11-e2e-gcp-crio
217-
optional: true
218-
rerun_command: /test e2e-gcp-crio
219-
run_if_changed: ^(vendor/k8s.io/kubernetes/pkg/kubelet)
220-
spec:
221-
containers:
222-
- args:
223-
- --gcs-upload-secret=/secrets/gcs/service-account.json
224-
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
225-
- --report-credentials-file=/etc/report/credentials
226-
- --secret-dir=/usr/local/e2e-gcp-crio-cluster-profile
227-
- --target=e2e-gcp-crio
228-
- --template=/usr/local/e2e-gcp-crio
229-
command:
230-
- ci-operator
231-
env:
232-
- name: CLUSTER_TYPE
233-
value: gcp
234-
- name: JOB_NAME_SAFE
235-
value: e2e-gcp-crio
236-
- name: TEST_COMMAND
237-
value: TEST_FOCUS=Suite:openshift/conformance/parallel TEST_FOCUS_SERIAL=Suite:openshift/conformance/serial/minimal
238-
run-tests
239-
image: ci-operator:latest
240-
imagePullPolicy: Always
241-
name: ""
242-
resources:
243-
requests:
244-
cpu: 10m
245-
volumeMounts:
246-
- mountPath: /usr/local/e2e-gcp-crio-cluster-profile
247-
name: cluster-profile
248-
- mountPath: /secrets/gcs
249-
name: gcs-credentials
250-
readOnly: true
251-
- mountPath: /usr/local/e2e-gcp-crio
252-
name: job-definition
253-
subPath: cluster-launch-e2e.yaml
254-
- mountPath: /secrets/manifest-tool
255-
name: manifest-tool-local-pusher
256-
readOnly: true
257-
- mountPath: /etc/pull-secret
258-
name: pull-secret
259-
readOnly: true
260-
- mountPath: /etc/report
261-
name: result-aggregator
262-
readOnly: true
263-
serviceAccountName: ci-operator
264-
volumes:
265-
- name: cluster-profile
266-
projected:
267-
sources:
268-
- secret:
269-
name: cluster-secrets-gcp
270-
- configMap:
271-
name: cluster-profile-gcp-crio
272-
- configMap:
273-
name: prow-job-cluster-launch-e2e
274-
name: job-definition
275-
- name: manifest-tool-local-pusher
276-
secret:
277-
secretName: manifest-tool-local-pusher
278-
- name: pull-secret
279-
secret:
280-
secretName: registry-pull-credentials
281-
- name: result-aggregator
282-
secret:
283-
secretName: result-aggregator
284-
trigger: (?m)^/test( | .* )e2e-gcp-crio,?($|\s.*)
285205
- agent: kubernetes
286206
always_run: true
287207
branches:

cluster/test-deploy/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ Prerequisites:
1212

1313
* `gcp-dev` (default) - 1 master, 3 node cluster with bootstrapping (uses the `openshift-gce-devel` project, suitable for developers)
1414
* `gcp` - 1 master, 3 node cluster with bootstrapping (uses the `openshift-gce-devel-ci` project, suitable for CI)
15-
* `gcp-ha` - 3 master, 3 node cluster with bootstrapping (uses the `openshift-gce-devel-ci` project, suitable for CI)
1615

1716
In each profile, see `vars-origin.yaml` for the default settings (which is common across all profiles) and `vars.yaml` for the variables that differ.
1817

@@ -58,7 +57,7 @@ $ make WHAT=mycluster down
5857
$ make WHAT=mycluster sh
5958
6059
# launch a different profile
61-
$ make WHAT=mycluster PROFILE=gcp-ha
60+
$ make WHAT=mycluster PROFILE=gcp
6261
```
6362

6463
## Advanced configuration

cluster/test-deploy/gcp-crio/.gitignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

cluster/test-deploy/gcp-crio/vars-origin.yaml

Lines changed: 0 additions & 101 deletions
This file was deleted.

cluster/test-deploy/gcp-crio/vars.yaml

Lines changed: 0 additions & 46 deletions
This file was deleted.

cluster/test-deploy/gcp-ha-static/.gitignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

cluster/test-deploy/gcp-ha-static/vars-origin.yaml

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)