diff --git a/ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml b/ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml index 748df3e5ced61..830a1cd2d8f30 100644 --- a/ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml +++ b/ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml @@ -12,7 +12,7 @@ build_root: images: items: - context_dir: "2" - dockerfile_path: Dockerfile.rhel8 + dockerfile_path: Dockerfile.rhel9 from: base inputs: src: @@ -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: diff --git a/ci-operator/jobs/openshift/jenkins/openshift-jenkins-master-postsubmits.yaml b/ci-operator/jobs/openshift/jenkins/openshift-jenkins-master-postsubmits.yaml index fd77557eef5fe..7b260f9e409a4 100644 --- a/ci-operator/jobs/openshift/jenkins/openshift-jenkins-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift/jenkins/openshift-jenkins-master-postsubmits.yaml @@ -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 diff --git a/ci-operator/jobs/openshift/jenkins/openshift-jenkins-master-presubmits.yaml b/ci-operator/jobs/openshift/jenkins/openshift-jenkins-master-presubmits.yaml index 5d7e700a1a5a0..b34407a59973e 100644 --- a/ci-operator/jobs/openshift/jenkins/openshift-jenkins-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/jenkins/openshift-jenkins-master-presubmits.yaml @@ -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 @@ -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 @@ -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 @@ -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" @@ -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" @@ -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" @@ -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"