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

manifests/9.2: Use RHEL 9.2 repos & cleanups #1204

Merged
merged 14 commits into from
Mar 21, 2023
Merged

manifests/9.2: Use RHEL 9.2 repos & cleanups #1204

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e346f8a
Revert "manifest/9.2: Ensure package come from RHEL by default"
travier Mar 16, 2023
3eb4abb
manifest/9.2: Keep legacy coreos/toolbox
travier Mar 16, 2023
aa7f640
manifests: Merge common-el9.yaml into common.yaml
travier Mar 16, 2023
54daebb
manifests/9.2: Use RHEL 9.2 repos
travier Mar 16, 2023
73a8eb2
manifest/c9s: Update for 4.14
travier Mar 16, 2023
ab22dee
manifest/c9s: Disable all repos by default
travier Mar 16, 2023
be10693
manifests: Remove RHEL 8 manifests
travier Mar 16, 2023
27cd97c
manifests: Remove RHEL 9.0 manifests
travier Mar 16, 2023
cdeb252
manifest: Back to rhel toolbox
cgwalters Mar 17, 2023
fa8eef4
rhel-9.2: Fix two more references to 9.0
cgwalters Mar 17, 2023
2715f8e
More use of 4.14
cgwalters Mar 20, 2023
ee85017
More 90 -> 92 adjustments
cgwalters Mar 20, 2023
c0ca55d
prow: Also pull in 4.13 temporarily
cgwalters Mar 20, 2023
630c049
Fix 9- to 9.2- for 4.14
cgwalters Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/prow-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ prepare_repos() {
# Assume C9S/SCOS if the version does not match known values for RHEL
# Temporary workaround until we have all packages for SCOS
curl --fail -L "http://base-${ocpver_mut}-rhel90.ocp.svc.cluster.local" -o "src/config/tmp.repo"
awk '/rhel-9.0-server-ose-4.13/,/^$/' "src/config/tmp.repo" > "src/config/ocp90.repo"
awk '/rhel-9-server-ose-4.14/,/^$/' "src/config/tmp.repo" > "src/config/ocp90.repo"
cat src/config/ocp90.repo
rm "src/config/tmp.repo"
;;
Expand Down
2 changes: 1 addition & 1 deletion manifest-c9s.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ repos:
- okd-copr
- podman-next-copr
# Include RHCOS 9 repo for oc, hyperkube and conmon-rs
- rhel-9.0-server-ose-4.13
- rhel-9-server-ose-4.14

# We include hours/minutes to avoid version number reuse
automatic-version-prefix: "414.9.<date:%Y%m%d%H%M>"
Expand Down
5 changes: 3 additions & 2 deletions manifest-rhel-9.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ repos:
- rhel-9.2-baseos
- rhel-9.2-appstream
- rhel-9.2-fast-datapath
- rhel-9.2-server-ose-4.13
- rhel-9.2-server-ose-4.13 # FIXME a few things are built only in 4.13 right now, like podman
Copy link
Member

Choose a reason for hiding this comment

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

Do we have a tracker for this we could paste here?

- rhel-9-server-ose-4.14

# We include hours/minutes to avoid version number reuse
automatic-version-prefix: "414.92.<date:%Y%m%d%H%M>"
Expand Down Expand Up @@ -120,7 +121,7 @@ repo-packages:
packages:
# We want the one shipping in RHEL, not the equivalently versioned one in RHAOS
- nss-altfiles
- repo: rhel-9.2-server-ose-4.13
- repo: rhel-9-server-ose-4.14
packages:
- conmon-rs
- cri-o
Expand Down