JKNS-1078: update CI config to use Dockerfile.rhel9 for master#80670
JKNS-1078: update CI config to use Dockerfile.rhel9 for master#80670kunalmemane wants to merge 1 commit into
Conversation
|
@kunalmemane: This pull request references JKNS-1078 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.0.0" version, but no target version was set. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
WalkthroughBoth image build entries in ChangesJenkins CI Image Build Config
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~2 minutes 🚥 Pre-merge checks | ✅ 15✅ Passed checks (15 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
@kunalmemane: |
and gegenerate prow job configs Signed-off-by: Kunal Memane <kmemane@redhat.com>
c699366 to
babbcda
Compare
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: kunalmemane The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
[REHEARSALNOTIFIER]
Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
/pj-rehearse more |
|
@prdhamdh: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse |
|
@kunalmemane: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse pull-ci-openshift-jenkins-master-e2e-aws |
|
@kunalmemane: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
@kunalmemane: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
|
/pj-rehearse pull-ci-openshift-jenkins-master-e2e-aws |
|
@kunalmemane: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
@kunalmemane: requesting more than one rehearsal in one comment is not supported. If you would like to rehearse multiple specific jobs, please separate the job names by a space in a single command. |
Summary
dockerfile_pathfromDockerfile.rhel8toDockerfile.rhel9for bothjenkinsandjenkins-agent-baseimage builds inopenshift-jenkins-master.yamlPR openshift/jenkins#2369 synced the master branch with
release-rhel9, including changes toinstall-jenkins-core-plugins.shthat write the Jenkins RPM repo file only to/etc/yum.repos.d/. The CI base image uses an ART yum/dnf wrapper that exclusively searches/etc/yum.repos.art/ci/, so the repo file is invisible to yum, resulting in:error: No package matches 'jenkins-2.541.3'
The
release-rhel9branch CI config already usesDockerfile.rhel9and works correctly. This aligns master to the same setup.Summary by CodeRabbit
This PR updates the OpenShift CI Jenkins image build configuration on the master branch to use RHEL 9-based Dockerfiles, fixing a compatibility issue introduced by a Jenkins core plugin sync.
What changed
ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml, both Jenkins-related image build entries now point toDockerfile.rhel9:context_dir: "2"→jenkinsimagecontext_dir: slave-base→jenkins-agent-baseimageWhy
release-rhel9branch CI configuration already works with RHEL 9 Dockerfiles.openshift/jenkins#2369,install-jenkins-core-plugins.shwrites the Jenkins RPM repo file to/etc/yum.repos.d/, but the ART yum/dnf wrapper used by the CI base image only looks under/etc/yum.repos.art/ci/. Using the RHEL 9 Dockerfile variant aligns master with the working setup and avoids failures like:No package matches 'jenkins-2.541.3'.Impact
Jira/automation note