Skip to content

USHIFT-3260: Fix build_bootc_images to be more robust when processing versions #3406

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

Merged
openshift-merge-bot merged 2 commits into from
May 30, 2024
Merged

USHIFT-3260: Fix build_bootc_images to be more robust when processing versions #3406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0c0ba1
Fix build_bootc_images to be more robust when processing versions
ggiguash May 29, 2024
620fa95
Use y-2 rhocp repository for bootc builds
ggiguash May 29, 2024
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
10 changes: 8 additions & 2 deletions test/bin/pyutils/build_bootc_images.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,17 @@ def set_rpm_version_info_vars():
FAKE_NEXT_MINOR_VERSION = str(int(MINOR_VERSION) + 1)
SOURCE_VERSION_BASE = common.run_command_in_shell(f"rpm -q --queryformat '%{{version}}' {release_info_rpm_base}")

CURRENT_RELEASE_VERSION = ""
CURRENT_RELEASE_REPO = ""
current_version_repo = common.run_command_in_shell(f"source {SCRIPTDIR}/get_rel_version_repo.sh; get_rel_version_repo {MINOR_VERSION}")
CURRENT_RELEASE_VERSION, CURRENT_RELEASE_REPO = current_version_repo.split(',')
if len(current_version_repo):
CURRENT_RELEASE_VERSION, CURRENT_RELEASE_REPO = current_version_repo.split(',')

PREVIOUS_RELEASE_VERSION = ""
PREVIOUS_RELEASE_REPO = ""
previous_version_repo = common.run_command_in_shell(f"source {SCRIPTDIR}/get_rel_version_repo.sh; get_rel_version_repo {PREVIOUS_MINOR_VERSION}")
PREVIOUS_RELEASE_VERSION, PREVIOUS_RELEASE_REPO = previous_version_repo.split(',')
if len(previous_version_repo):
PREVIOUS_RELEASE_VERSION, PREVIOUS_RELEASE_REPO = previous_version_repo.split(',')

RHOCP_MINOR_Y = ""
RHOCP_MINOR_Y1 = ""
Expand Down
4 changes: 3 additions & 1 deletion test/bootc-sources/microshift_repo_config.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ EOF
}

config_centos9_repos() {
# The y-1 version repository is guaranteed to be available on the mirror
cat > "${OCP_MIRROR_REPO_FILE}" <<EOF
[openshift-mirror-beta]
name=OpenShift Mirror Beta Repository
Expand Down Expand Up @@ -70,10 +71,11 @@ sslclientcert = ${sslcrt}
skip_if_unavailable=0
EOF

# Only the y-2 version is guaranteed to be available for released repositories
cat > "${OCP_RHOCP_REPO_FILE}" <<EOF
[openshift-rhocp]
name=OpenShift Dependencies RHEL 9
baseurl=https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/4.{{ .Env.PREVIOUS_MINOR_VERSION }}/os
baseurl=https://cdn.redhat.com/content/dist/layered/rhel9/{{ .Env.UNAME_M }}/rhocp/4.{{ .Env.YMINUS2_MINOR_VERSION }}/os
enabled=1
gpgcheck=1
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
Expand Down