Skip to content

Upgrade OpenShift to 4.8 and go to 1.15 #21509

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
base_images:
cli:
name: "4.7"
name: "4.8"
namespace: ocp
tag: cli
build_root:
image_stream_tag:
name: release
namespace: openshift
tag: golang-1.13
tag: golang-1.15
images:
- dockerfile_path: build/Dockerfile
to: devworkspace-operator
Expand All @@ -16,7 +16,7 @@ releases:
release:
architecture: amd64
channel: stable
version: "4.7"
version: "4.8"
resources:
'*':
limits:
Expand Down Expand Up @@ -64,4 +64,4 @@ zz_generated_metadata:
branch: main
org: devfile
repo: devworkspace-operator
variant: v7
variant: v8
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ presubmits:
- ^main$
- ^main-
cluster: build01
context: ci/prow/v7-devworkspace-happy-path
context: ci/prow/v8-devworkspace-happy-path
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
ci-operator.openshift.io/variant: v7
ci-operator.openshift.io/variant: v8
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-devfile-devworkspace-operator-main-v7-devworkspace-happy-path
rerun_command: /test v7-devworkspace-happy-path
name: pull-ci-devfile-devworkspace-operator-main-v8-devworkspace-happy-path
rerun_command: /test v8-devworkspace-happy-path
spec:
containers:
- args:
Expand All @@ -26,7 +26,7 @@ presubmits:
- --secret-dir=/secrets/ci-pull-credentials
- --secret-dir=/usr/local/devworkspace-happy-path-cluster-profile
- --target=devworkspace-happy-path
- --variant=v7
- --variant=v8
command:
- ci-operator
image: ci-operator:latest
Expand Down Expand Up @@ -77,23 +77,23 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )v7-devworkspace-happy-path,?($|\s.*)
trigger: (?m)^/test( | .* )v8-devworkspace-happy-path,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^main$
- ^main-
cluster: build01
context: ci/prow/v7-devworkspaces-operator-e2e
context: ci/prow/v8-devworkspaces-operator-e2e
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
ci-operator.openshift.io/variant: v7
ci-operator.openshift.io/variant: v8
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-devfile-devworkspace-operator-main-v7-devworkspaces-operator-e2e
rerun_command: /test v7-devworkspaces-operator-e2e
name: pull-ci-devfile-devworkspace-operator-main-v8-devworkspaces-operator-e2e
rerun_command: /test v8-devworkspaces-operator-e2e
spec:
containers:
- args:
Expand All @@ -104,7 +104,7 @@ presubmits:
- --secret-dir=/secrets/ci-pull-credentials
- --secret-dir=/usr/local/devworkspaces-operator-e2e-cluster-profile
- --target=devworkspaces-operator-e2e
- --variant=v7
- --variant=v8
command:
- ci-operator
image: ci-operator:latest
Expand Down Expand Up @@ -155,31 +155,31 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )v7-devworkspaces-operator-e2e,?($|\s.*)
trigger: (?m)^/test( | .* )v8-devworkspaces-operator-e2e,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^main$
- ^main-
cluster: build01
context: ci/prow/v7-images
context: ci/prow/v8-images
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
ci-operator.openshift.io/variant: v7
ci-operator.openshift.io/variant: v8
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-devfile-devworkspace-operator-main-v7-images
rerun_command: /test v7-images
name: pull-ci-devfile-devworkspace-operator-main-v8-images
rerun_command: /test v8-images
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-credentials-file=/etc/report/credentials
- --target=[images]
- --variant=v7
- --variant=v8
command:
- ci-operator
image: ci-operator:latest
Expand All @@ -206,4 +206,4 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )v7-images,?($|\s.*)
trigger: (?m)^/test( | .* )v8-images,?($|\s.*)