Skip to content

ci: point terraform-provider-rhcs at staged build/ CI Dockerfiles - #82637

Open
amandahla wants to merge 1 commit into
openshift:mainfrom
amandahla:terraform-provider-rhcs-stage-ci-dockerfiles
Open

ci: point terraform-provider-rhcs at staged build/ CI Dockerfiles#82637
amandahla wants to merge 1 commit into
openshift:mainfrom
amandahla:terraform-provider-rhcs-stage-ci-dockerfiles

Conversation

@amandahla

@amandahla amandahla commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Switch terraform-provider-rhcs main ci-operator config from build_root.from_repository + root Dockerfile.clients to the paths staged in terraform-redhat/terraform-provider-rhcs#1271:
    • build_root.project_image.dockerfile_path: build/custom-ci-build-root.Dockerfile (ubi9/go-toolset:1.26.5 + git/jq for Snyk)
    • images.items[].dockerfile_path: build/Dockerfile.ci
  • Regenerate main presubmit sparse checkout paths accordingly.

Why

Optional ci/prow/security (Snyk) runs on the src image from build_root. With from_repository: true, Go patch selection is limited to the ImageStream tag. project_image unlocks the staged Go 1.26.5 toolset image.

Test plan

  • /pj-rehearse pull-ci-terraform-redhat-terraform-provider-rhcs-main-images
  • /pj-rehearse pull-ci-terraform-redhat-terraform-provider-rhcs-main-pre-push-checks
  • /pj-rehearse pull-ci-terraform-redhat-terraform-provider-rhcs-main-security (confirm Go toolset / Snyk env)
  • Confirm e2e variants still use from_repository + build/ci-tf-e2e.Dockerfile (unchanged)

Follow-up (provider repo)

After this merges: remove unused root Dockerfile.clients and revisit .ci-operator.yaml once from_repository is unused on main.

Made with Cursor

Summary by CodeRabbit

Updates the terraform-provider-rhcs main CI pipeline to build its project and client images from the staged Dockerfiles, enabling Snyk jobs to use the ubi9/go-toolset:1.26.5 environment with required tooling. E2E variants continue using their repository-based image configuration.

Activate project_image build_root and clients image paths staged in
terraform-provider-rhcs#1271 so Snyk can use ubi9/go-toolset:1.26.5.

Co-authored-by: Cursor <cursoragent@cursor.com>
@coderabbitai

coderabbitai Bot commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

Walkthrough

The CI operator configuration replaces repository-based build-root selection with an explicit Dockerfile and changes the client image to use build/Dockerfile.ci.

Changes

Terraform provider CI image configuration

Layer / File(s) Summary
Configure explicit image Dockerfiles
ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main.yaml
The build root uses build/custom-ci-build-root.Dockerfile, and the client image uses build/Dockerfile.ci instead of the previous Dockerfiles or repository-based setting.

Estimated code review effort: 1 (Trivial) | ~5 minutes

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
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 PR only updates ci-operator YAML and sparse-checkout paths; no Ginkgo test titles were added or modified.
Test Structure And Quality ✅ Passed No Ginkgo test code changed; this PR only updates ci-operator config and presubmit YAML, so the test-structure check is not applicable.
Microshift Test Compatibility ✅ Passed No Ginkgo tests or Go sources changed; only ci-operator YAML and sparse-checkout paths were updated, so MicroShift compatibility isn’t implicated.
Single Node Openshift (Sno) Test Compatibility ✅ Passed Only ci-operator/presubmit YAML changed; no new Ginkgo e2e tests or topology-sensitive code was added.
Topology-Aware Scheduling Compatibility ✅ Passed Only ci-operator config/presubmit sparse-checkout changed; no workload manifests, controllers, or scheduling fields were introduced.
Ote Binary Stdout Contract ✅ Passed Only ci-operator YAML changed; no main/init/suite code or stdout logging was modified.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No Ginkgo/e2e test code changed; only CI config and generated presubmit paths were updated, so the IPv6/disconnected-network check is not applicable.
No-Weak-Crypto ✅ Passed Only CI YAML path updates; no crypto code, weak algorithms, custom crypto, or token comparisons appear in the diff.
Container-Privileges ✅ Passed Changed CI YAMLs contain no privileged/hostPID/hostNetwork/hostIPC/SYS_ADMIN/allowPrivilegeEscalation/root settings.
No-Sensitive-Data-In-Logs ✅ Passed Diff only updates ci-operator build image paths and sparse checkout files; no new logging, secrets, tokens, or PII are added.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly reflects the main change: switching terraform-provider-rhcs CI to staged build Dockerfiles.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@amandahla

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-terraform-redhat-terraform-provider-rhcs-main-images pull-ci-terraform-redhat-terraform-provider-rhcs-main-pre-push-checks pull-ci-terraform-redhat-terraform-provider-rhcs-main-security

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 29, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@amandahla: 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-terraform-redhat-terraform-provider-rhcs-main-e2e-images terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-images terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-classic-full-resources-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-day1-supplemental-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-advanced-critical-high-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-advanced-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-arm-critical-high-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-arm-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-encryption-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-full-resources-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-network-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-private-critical-high-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-private-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-upgrade-y-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-hcp-upgrade-z-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-advanced-critical-high-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-advanced-day1-negative-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-advanced-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-private-critical-high-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-private-day1-negative-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-private-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-shared-vpc-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-upgrade-y-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-e2e-presubmits-rosa-sts-upgrade-z-optional-presubmit terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed
pull-ci-terraform-redhat-terraform-provider-rhcs-main-govulncheck terraform-redhat/terraform-provider-rhcs presubmit Ci-operator config changed

A total of 45 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

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.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@openshift-ci

openshift-ci Bot commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

@amandahla: 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/terraform-redhat/terraform-provider-rhcs/main/security b9a3e48 link unknown /pj-rehearse pull-ci-terraform-redhat-terraform-provider-rhcs-main-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.

@amandahla

Copy link
Copy Markdown
Contributor Author

Perfect, now Synk is scanning again and failed due security issue found.

@jerichokeyne

Copy link
Copy Markdown
Contributor

/lgtm
/approve

@jerichokeyne

Copy link
Copy Markdown
Contributor

/pj-rehease ack

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 30, 2026
@openshift-ci

openshift-ci Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: amandahla, jerichokeyne

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

The pull request process is described 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

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants