Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NO-JIRA: ci/get-ocp-repo.sh: generalize and reuse #1650

Merged
merged 2 commits into from
Nov 26, 2024
Merged

NO-JIRA: ci/get-ocp-repo.sh: generalize and reuse #1650

merged 2 commits into from
Nov 26, 2024

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Nov 19, 2024

I'm looking at building the node image in OpenShift CI and of course we
also need to fetch the OCP repos in that flow too.

Let's make get-ocp-repo.sh support all the use cases it needs, which
allows us to dedupe with ci/prow-entrypoint.sh.

@jlebon
Containerfile: use correct tag in FROM
e7b8ddc 
I think at the time I wrote this, I hadn't set up the pipeline yet for
it, so I wasn't sure what its tag name was going to me. We know it now,
so just fix this.
@jlebon
Copy link
Member Author

jlebon commented Nov 19, 2024

Let's wait for branching to get this one in.
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 19, 2024
@openshift-ci openshift-ci bot requested review from dustymabe and travier November 19, 2024 20:09
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 19, 2024
@jlebon
ci/get-ocp-repo.sh: generalize and reuse
e47c4af 
I'm looking at building the node image in OpenShift CI and of course we
also need to fetch the OCP repos in that flow too.

Let's make `get-ocp-repo.sh` support all the use cases it needs, which
allows us to dedupe with `ci/prow-entrypoint.sh`.
@jlebon jlebon force-pushed the pr/get-ocp-repo-rework branch from 16cf352 to e47c4af Compare November 20, 2024 21:32
@travier
Copy link
Member

travier commented Nov 21, 2024

CI output looks weird:

Discovered rpm-md repositories:
- c9s-baseos-mirror
- c9s-appstream-mirror
- c9s-nfv-mirror
- c9s-rt-mirror
- c9s-baseos
- c9s-appstream
- c9s-extras-common
- c9s-nfv
- c9s-rt
- c9s-sig-nfv
- c9s-sig-virtualization
- c9s-sig-cloud-okd
- rhel-9-baseos
- rhel-9-appstream
- rhel-9-fast-datapath
- rhel-9-nfv
- rhel-9-server-ose
- rhel-9-codeready-builder-rpms
- rhel-9-baseos-ppc64le
- rhel-9-appstream-ppc64le
- rhel-9-fast-datapath-ppc64le
- rhel-9-nfv-ppc64le
- rhel-9-server-ose-ppc64le
- rhel-9-codeready-builder-rpms-ppc64le
- rhel-9-baseos-s390x
- rhel-9-appstream-s390x
- rhel-9-fast-datapath-s390x
- rhel-9-nfv-s390x
- rhel-9-server-ose-s390x
- rhel-9-codeready-builder-rpms-s390x
- rhel-9-baseos-aarch64
- rhel-9-appstream-aarch64
- rhel-9-fast-datapath-aarch64
- rhel-9-nfv-aarch64
- rhel-9-server-ose-aarch64
- rhel-9-codeready-builder-rpms-aarch64
- rhel-9-openstack-17-rpms
error: Installing packages: Unknown rpm-md repository: rhel-9.4-server-ose-4.18

travier
travier reviewed Nov 21, 2024
View reviewed changes
Copy link
Member

@travier travier left a comment

Choose a reason for hiding this comment

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

LGTM on the approach.

@jlebon
Copy link
Member Author

jlebon commented Nov 22, 2024

CI output looks weird:

Yeah, it requires #1651.

@jlebon
Copy link
Member Author

jlebon commented Nov 26, 2024

/test images
/retest

@jlebon jlebon changed the title ci/get-ocp-repo.sh: generalize and reuse NO-JIRA: ci/get-ocp-repo.sh: generalize and reuse Nov 26, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 26, 2024
@openshift-ci-robot
Copy link

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

In response to this:

I'm looking at building the node image in OpenShift CI and of course we
also need to fetch the OCP repos in that flow too.

Let's make get-ocp-repo.sh support all the use cases it needs, which
allows us to dedupe with ci/prow-entrypoint.sh.

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.

@jlebon
Copy link
Member Author

jlebon commented Nov 26, 2024

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 26, 2024
travier
travier reviewed Nov 26, 2024
View reviewed changes
packages-openshift.yaml
# This should match the /etc/os-release manipulation we do below when
# injecting `OPENSHIFT_VERSION`. It's used by CI to determine the repos to
# inject when building the layered image.
ocp_version: "4.18"
Copy link
Member

Choose a reason for hiding this comment

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

Aren't we 4.19 now?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, this will be bumped along with the other 4.18 references in the repo.

@travier
Copy link
Member

travier commented Nov 26, 2024

We haven't made the 4.19 bump yet.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 26, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Nov 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jlebon, travier

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

The pull request process is described here

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

@mike-nguyen
Copy link
Member

I'm working on the version bump. We have a openshift/release PR that hasn't merged yet.

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Nov 26, 2024

@jlebon: all tests passed!

Full PR test history. Your PR dashboard.

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.

@openshift-merge-bot openshift-merge-bot bot merged commit 0dbd87a into openshift:master Nov 26, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@travier travier travier left review comments

@dustymabe dustymabe Awaiting requested review from dustymabe

Assignees

@travier travier

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jlebon @travier @openshift-ci-robot @mike-nguyen