Skip to content

OCPBUGS-86889: use new skopeo location and follow redirects#6118

Open
cheesesashimi wants to merge 1 commit into
openshift:mainfrom
cheesesashimi:zzlotnik/fix-skopeo-install
Open

OCPBUGS-86889: use new skopeo location and follow redirects#6118
cheesesashimi wants to merge 1 commit into
openshift:mainfrom
cheesesashimi:zzlotnik/fix-skopeo-install

Conversation

@cheesesashimi
Copy link
Copy Markdown
Member

@cheesesashimi cheesesashimi commented Jun 2, 2026

- What I did

Skopeo recently changed locations from https://github.com/containers/skopeo to https://github.com/podman-container-tools/skopeo. The hack/install-skopeo.sh script was not following redirects, causing it to break. This script has been updated to use the new location along with modifying the curl call to follow redirects.

- How to verify it

This change primarily impacts the OpenShift e2e-gcp-op-ocl-part1 and e2e-gcp-op-ocl-part2 jobs. So running those should verify that the change is successful.

- Description for the changelog
Use new Skopeo location for OCL E2E tests

Summary by CodeRabbit

  • Chores
    • Updated the skopeo installation script to retrieve release version information from an updated GitHub source.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@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 2, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@cheesesashimi: This pull request explicitly references no jira issue.

Details

In response to this:

- What I did

Skopeo recently changed locations from https://github.com/containers/skopeo to https://github.com/podman-container-tools/skopeo. The hack/install-skopeo.sh script was not following redirects, causing it to break. This script has been updated to use the new location along with modifying the curl call to follow redirects.

- How to verify it

This change primarily impacts the OpenShift e2e-gcp-op-ocl-part1 and e2e-gcp-op-ocl-part2 jobs. So running those should verify that the change is successful.

- Description for the changelog
Use new Skopeo location for OCL E2E tests

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
Copy link
Copy Markdown

coderabbitai Bot commented Jun 2, 2026

Walkthrough

The installation script's logic for fetching the latest skopeo release is updated by changing the GitHub API endpoint from containers/skopeo to podman-container-tools/skopeo. The rest of the install flow remains unchanged.

Changes

Skopeo installation source update

Layer / File(s) Summary
GitHub API endpoint for skopeo version
hack/install-skopeo.sh
GitHub releases API endpoint updated to fetch skopeo version from podman-container-tools/skopeo instead of containers/skopeo.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (14 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
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 The custom check validates Ginkgo test name stability. The PR only modifies hack/install-skopeo.sh, a bash script with no Ginkgo tests, making the check not applicable.
Test Structure And Quality ✅ Passed PR only modifies hack/install-skopeo.sh (shell script), not Ginkgo test code. Custom check requires reviewing Ginkgo tests but none are changed in this PR.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests were added in this PR. The PR updates hack/install-skopeo.sh and adds standard Go unit tests using TestXxx functions, not Ginkgo BDD-style tests.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR modifies only hack/install-skopeo.sh (infrastructure script), not adding any new Ginkgo e2e tests; check is not applicable to this PR.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies hack/install-skopeo.sh (a build/installation script), not deployment manifests, operator code, or controllers. Topology-aware scheduling check does not apply.
Ote Binary Stdout Contract ✅ Passed The PR's OTE binary (cmd/machine-config-tests-ext/main.go) contains no non-JSON stdout writes from process-level code (main, init, etc.) that would violate the OTE Binary Stdout Contract.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No new Ginkgo e2e tests added. PR only modifies hack/install-skopeo.sh to update the GitHub repository endpoint for skopeo version retrieval.
No-Weak-Crypto ✅ Passed The PR changes only an installation bash script with no cryptographic code, weak crypto algorithms, custom crypto implementations, or secret comparisons.
Container-Privileges ✅ Passed PR modifies hack/install-skopeo.sh (non-privileged script) and adds manifests with justified privileged settings for system-critical MCO components.
No-Sensitive-Data-In-Logs ✅ Passed The PR modifies hack/install-skopeo.sh to update a GitHub API endpoint and add curl redirect flag. No passwords, tokens, API keys, or PII are logged.
Title check ✅ Passed The title accurately reflects the main change: updating the skopeo installation script to use the new repository location (podman-container-tools/skopeo) and follow HTTP redirects.

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

✨ 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 and usage tips.

@openshift-ci openshift-ci Bot requested review from RishabhSaini and umohnani8 June 2, 2026 17:02
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 2, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cheesesashimi

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 2, 2026
Copy link
Copy Markdown

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
hack/install-skopeo.sh (1)

44-44: ⚠️ Potential issue | 🔴 Critical | ⚡ Quick win

Critical: Git clone URL still points to old repository location.

Line 35 was updated to use the new repository location podman-container-tools/skopeo for fetching the latest release tag, but this line still clones from the old location containers/skopeo. This inconsistency will likely cause the installation to fail if the repository has truly moved, or may result in cloning from an outdated/unmaintained location.

🐛 Proposed fix
-  git clone --branch "$skopeo_version" --depth 1 https://github.com/containers/skopeo.git "$skopeo_clone_dir"
+  git clone --branch "$skopeo_version" --depth 1 https://github.com/podman-container-tools/skopeo.git "$skopeo_clone_dir"
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@hack/install-skopeo.sh` at line 44, The git clone command that uses
skopeo_version to checkout a branch still points to the old repository
"containers/skopeo"; update that command to clone from the new repo
"podman-container-tools/skopeo" (keep the existing --branch "$skopeo_version"
--depth 1 and destination "$skopeo_clone_dir"), so the clone URL matches the
earlier lookup of the latest tag and avoids fetching the wrong repository.
🧹 Nitpick comments (1)
hack/install-skopeo.sh (1)

3-3: ⚡ Quick win

Consider adding pipefail to the set options.

The script uses set -xeuo but is missing the pipefail option. Adding it would ensure that errors in command pipelines (like line 35 where curl output is piped to python3) are properly caught and cause the script to exit.

🛡️ Proposed fix
-set -xeuo
+set -xeuo pipefail
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@hack/install-skopeo.sh` at line 3, The script's set options currently read
"set -xeuo" which omits pipefail, so pipeline errors (e.g., the curl | python3
pipeline) won't cause the script to fail; update the options used in that set
invocation (the line containing set -xeuo) to include pipefail (e.g., use set
-euo pipefail or set -xeuo pipefail / set -o pipefail) so any command in a
pipeline failing will trigger script exit.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Outside diff comments:
In `@hack/install-skopeo.sh`:
- Line 44: The git clone command that uses skopeo_version to checkout a branch
still points to the old repository "containers/skopeo"; update that command to
clone from the new repo "podman-container-tools/skopeo" (keep the existing
--branch "$skopeo_version" --depth 1 and destination "$skopeo_clone_dir"), so
the clone URL matches the earlier lookup of the latest tag and avoids fetching
the wrong repository.

---

Nitpick comments:
In `@hack/install-skopeo.sh`:
- Line 3: The script's set options currently read "set -xeuo" which omits
pipefail, so pipeline errors (e.g., the curl | python3 pipeline) won't cause the
script to fail; update the options used in that set invocation (the line
containing set -xeuo) to include pipefail (e.g., use set -euo pipefail or set
-xeuo pipefail / set -o pipefail) so any command in a pipeline failing will
trigger script exit.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 79ec600e-4e29-44e5-9f98-a7b5f8cbe465

📥 Commits

Reviewing files that changed from the base of the PR and between 26d41f7 and af83229.

📒 Files selected for processing (1)
  • hack/install-skopeo.sh

@cheesesashimi cheesesashimi changed the title NO-ISSUE: use new skopeo location and follow redirects OCPBUGS-86889: use new skopeo location and follow redirects Jun 2, 2026
@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jun 2, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@cheesesashimi: This pull request references Jira Issue OCPBUGS-86889, which is invalid:

  • expected the bug to target the "5.0.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

- What I did

Skopeo recently changed locations from https://github.com/containers/skopeo to https://github.com/podman-container-tools/skopeo. The hack/install-skopeo.sh script was not following redirects, causing it to break. This script has been updated to use the new location along with modifying the curl call to follow redirects.

- How to verify it

This change primarily impacts the OpenShift e2e-gcp-op-ocl-part1 and e2e-gcp-op-ocl-part2 jobs. So running those should verify that the change is successful.

- Description for the changelog
Use new Skopeo location for OCL E2E tests

Summary by CodeRabbit

  • Chores
  • Updated the skopeo installation script to retrieve release version information from an updated GitHub source.

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.

@cheesesashimi
Copy link
Copy Markdown
Member Author

/test e2e-gcp-op-ocl-part1
/test e2e-gcp-op-ocl-part2

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 2, 2026

@cheesesashimi: 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/prow/e2e-gcp-op-ocl-part1 af83229 link true /test e2e-gcp-op-ocl-part1

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.

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. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. 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.

2 participants