Skip to content

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

Open
kunalmemane wants to merge 1 commit into
openshift:mainfrom
kunalmemane:update-jenkins-ci
Open

JKNS-1078: update CI config to use Dockerfile.rhel9 for master#80670
kunalmemane wants to merge 1 commit into
openshift:mainfrom
kunalmemane:update-jenkins-ci

Conversation

@kunalmemane

@kunalmemane kunalmemane commented Jun 17, 2026

Copy link
Copy Markdown
Member

Summary

  • Update dockerfile_path from Dockerfile.rhel8 to Dockerfile.rhel9 for both jenkins and jenkins-agent-base image builds in openshift-jenkins-master.yaml

PR openshift/jenkins#2369 synced the master branch with release-rhel9, including changes to install-jenkins-core-plugins.sh that 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-rhel9 branch CI config already uses Dockerfile.rhel9 and 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

  • In ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml, both Jenkins-related image build entries now point to Dockerfile.rhel9:
    • context_dir: "2"jenkins image
    • context_dir: slave-basejenkins-agent-base image

Why

  • The release-rhel9 branch CI configuration already works with RHEL 9 Dockerfiles.
  • After openshift/jenkins#2369, install-jenkins-core-plugins.sh writes 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

  • Configuration-only change to the CI build process for Jenkins images in OpenShift CI; no application code changes.

Jira/automation note

  • The PR references JKNS-1078; automation also warned that no target version was set on the issue.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 17, 2026
@openshift-ci-robot

openshift-ci-robot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

@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.

Details

In response to this:

Summary

  • Update dockerfile_path from Dockerfile.rhel8 to Dockerfile.rhel9 for both jenkins and jenkins-agent-base image builds in openshift-jenkins-master.yaml

PR openshift/jenkins#2369 synced the master branch with release-rhel9, including changes to install-jenkins-core-plugins.sh that 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-rhel9 branch CI config already uses Dockerfile.rhel9 and works correctly. This aligns master to the same setup.

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.

@coderabbitai

coderabbitai Bot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Walkthrough

Both image build entries in ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml have their dockerfile_path changed from Dockerfile.rhel8 to Dockerfile.rhel9.

Changes

Jenkins CI Image Build Config

Layer / File(s) Summary
Update both image dockerfile_path entries to rhel9
ci-operator/config/openshift/jenkins/openshift-jenkins-master.yaml
The dockerfile_path field for both image items is changed from Dockerfile.rhel8 to Dockerfile.rhel9.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and specifically describes the main change: updating the CI configuration to use Dockerfile.rhel9 for the master branch Jenkins builds, which aligns with the PR objectives.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed This PR contains no Ginkgo tests. It modifies CI configuration files (YAML) and utility Go files. The check for stable test names is not applicable.
Test Structure And Quality ✅ Passed This PR contains only CI configuration changes (YAML file) updating Dockerfile paths. No Ginkgo test code is added or modified, making the test structure quality check not applicable to this PR.
Microshift Test Compatibility ✅ Passed This PR only modifies CI configuration files (openshift-jenkins-master.yaml and related prow job configs), not test code. No new Ginkgo e2e tests are added, making the MicroShift compatibility chec...
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR contains only CI configuration changes (Dockerfile.rhel8→.rhel9) with no new Ginkgo e2e tests added, so SNO compatibility check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies only CI operator configuration (dockerfile_path updates), not deployment manifests, operator code, or controllers. No scheduling constraints present.
Ote Binary Stdout Contract ✅ Passed PR only modifies YAML configuration files; no code changes that could write to stdout. OTE Binary Stdout Contract check applies to process-level code, which is not affected.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Custom check not applicable: PR adds no new Ginkgo e2e tests. Changes are only to a YAML CI configuration file updating Dockerfile references.
No-Weak-Crypto ✅ Passed The PR modifies only a YAML CI configuration file to update Dockerfile paths. No weak crypto patterns, custom crypto implementations, or non-constant-time comparisons are present or introduced.
Container-Privileges ✅ Passed File is a CI Operator config, not a K8s manifest. Contains no privileged container settings (no privileged, hostPID, hostNetwork, hostIPC, SYS_ADMIN, allowPrivilegeEscalation, or root user configs).
No-Sensitive-Data-In-Logs ✅ Passed PR only modifies YAML configuration file with no new logging, debug output, or any statements that could expose passwords, tokens, API keys, PII, or customer data.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci Bot requested review from divyansh42 and prdhamdh June 17, 2026 15:29
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@kunalmemane: pj-rehearse could not automatically process this event because the request waited in queue for longer than 5 minutes. Use /pj-rehearse to trigger rehearsals manually.

     and gegenerate prow job configs

Signed-off-by: Kunal Memane <kmemane@redhat.com>
@openshift-ci

openshift-ci Bot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: kunalmemane
Once this PR has been reviewed and has the lgtm label, please assign k37y for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@kunalmemane: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-jenkins-master-e2e-aws openshift/jenkins presubmit Ci-operator config changed
pull-ci-openshift-jenkins-master-e2e-aws-jenkins-client-plugin openshift/jenkins presubmit Ci-operator config changed
pull-ci-openshift-jenkins-master-e2e-aws-jenkins-sync-plugin openshift/jenkins presubmit Ci-operator config changed
pull-ci-openshift-jenkins-master-e2e-jenkins-image-tests openshift/jenkins presubmit Ci-operator config changed
pull-ci-openshift-jenkins-master-images openshift/jenkins presubmit Ci-operator config changed
pull-ci-openshift-jenkins-master-jenkins-check-plugins-supply-chain-change openshift/jenkins presubmit Ci-operator config changed
pull-ci-openshift-jenkins-master-security openshift/jenkins presubmit Ci-operator config changed
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@prdhamdh

Copy link
Copy Markdown
Contributor

/pj-rehearse more

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@prdhamdh: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@kunalmemane

Copy link
Copy Markdown
Member Author

/pj-rehearse

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@kunalmemane: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@kunalmemane

Copy link
Copy Markdown
Member Author

/pj-rehearse pull-ci-openshift-jenkins-master-e2e-aws

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@kunalmemane: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci

openshift-ci Bot commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

@kunalmemane: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/rehearse/openshift/jenkins/master/security babbcda link unknown /pj-rehearse pull-ci-openshift-jenkins-master-security

Full PR test history. Your PR dashboard.

Details

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 kubernetes-sigs/prow repository. I understand the commands that are listed here.

@kunalmemane

Copy link
Copy Markdown
Member Author

/pj-rehearse pull-ci-openshift-jenkins-master-e2e-aws
/pj-rehearse pull-ci-openshift-jenkins-master-security

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@kunalmemane: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants