Skip to content

JKNS-1078: update CI config to use Dockerfile.rhel9 for master #80670

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

Open
kunalmemane wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −18
Open

JKNS-1078: update CI config to use Dockerfile.rhel9 for master #80670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build_root:
images:
items:
- context_dir: "2"
dockerfile_path: Dockerfile.rhel8
dockerfile_path: Dockerfile.rhel9
from: base
inputs:
src:
Expand All @@ -21,7 +21,7 @@ images:
source_path: /go/src/github.com/openshift/jenkins/2/.
to: jenkins
- context_dir: slave-base
dockerfile_path: Dockerfile.rhel8
dockerfile_path: Dockerfile.rhel9
from: base
inputs:
src:
Expand Down
4 changes: 2 additions & 2 deletions ci-operator/jobs/openshift/jenkins/openshift-jenkins-master-postsubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ postsubmits:
decoration_config:
sparse_checkout_files:
- .ci-operator.yaml
- 2/Dockerfile.rhel8
- slave-base/Dockerfile.rhel8
- 2/Dockerfile.rhel9
- slave-base/Dockerfile.rhel9
labels:
ci-operator.openshift.io/is-promotion: "true"
ci.openshift.io/generator: prowgen
Expand Down
28 changes: 14 additions & 14 deletions ci-operator/jobs/openshift/jenkins/openshift-jenkins-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ presubmits:
decoration_config:
sparse_checkout_files:
- .ci-operator.yaml
- 2/Dockerfile.rhel8
- slave-base/Dockerfile.rhel8
- 2/Dockerfile.rhel9
- slave-base/Dockerfile.rhel9
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
Expand Down Expand Up @@ -97,8 +97,8 @@ presubmits:
decoration_config:
sparse_checkout_files:
- .ci-operator.yaml
- 2/Dockerfile.rhel8
- slave-base/Dockerfile.rhel8
- 2/Dockerfile.rhel9
- slave-base/Dockerfile.rhel9
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
Expand Down Expand Up @@ -183,8 +183,8 @@ presubmits:
decoration_config:
sparse_checkout_files:
- .ci-operator.yaml
- 2/Dockerfile.rhel8
- slave-base/Dockerfile.rhel8
- 2/Dockerfile.rhel9
- slave-base/Dockerfile.rhel9
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
Expand Down Expand Up @@ -269,8 +269,8 @@ presubmits:
decoration_config:
sparse_checkout_files:
- .ci-operator.yaml
- 2/Dockerfile.rhel8
- slave-base/Dockerfile.rhel8
- 2/Dockerfile.rhel9
- slave-base/Dockerfile.rhel9
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
Expand Down Expand Up @@ -336,8 +336,8 @@ presubmits:
decoration_config:
sparse_checkout_files:
- .ci-operator.yaml
- 2/Dockerfile.rhel8
- slave-base/Dockerfile.rhel8
- 2/Dockerfile.rhel9
- slave-base/Dockerfile.rhel9
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
Expand Down Expand Up @@ -395,8 +395,8 @@ presubmits:
decoration_config:
sparse_checkout_files:
- .ci-operator.yaml
- 2/Dockerfile.rhel8
- slave-base/Dockerfile.rhel8
- 2/Dockerfile.rhel9
- slave-base/Dockerfile.rhel9
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
Expand Down Expand Up @@ -462,8 +462,8 @@ presubmits:
decoration_config:
sparse_checkout_files:
- .ci-operator.yaml
- 2/Dockerfile.rhel8
- slave-base/Dockerfile.rhel8
- 2/Dockerfile.rhel9
- slave-base/Dockerfile.rhel9
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
Expand Down