From 4f0fe7f8f113b9191483100200d0fdf6d2aa9f87 Mon Sep 17 00:00:00 2001 From: Huijing Hei Date: Thu, 24 Mar 2022 10:59:46 +0800 Subject: [PATCH 1/4] manifest.yaml: update automatic-version-prefix to 86 Bump RHCOS to RHEL 8.6 Content --- manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.yaml b/manifest.yaml index 0a4bfb806..488609495 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -46,7 +46,7 @@ repos: rpmdb: bdb # We include hours/minutes to avoid version number reuse -automatic-version-prefix: "411.85." +automatic-version-prefix: "411.86." # This ensures we're semver-compatible which OpenShift wants automatic-version-suffix: "-" # Keep this is sync with the version in postprocess From fd8a0c8f32bf47f83e318cfee6c3313a6bb32cf1 Mon Sep 17 00:00:00 2001 From: Huijing Hei Date: Thu, 24 Mar 2022 11:04:43 +0800 Subject: [PATCH 2/4] Revert "25rhcos-azure-udev-rules: add 50-azure-ptp.rules" This reverts commit 871e36f8d48ced95f6f34c834538a5d97224b9e3. The fix has landed in RHEL8.6 See: - https://bugzilla.redhat.com/show_bug.cgi?id=1991834 - Fixed RPM version: systemd-239-53.el8 --- .../usr/lib/udev/rules.d/50-azure-ptp.rules | 5 ----- tests/kola/version/drop-azure-ptp | 13 ------------- 2 files changed, 18 deletions(-) delete mode 100644 overlay.d/25rhcos-azure-udev-rules/usr/lib/udev/rules.d/50-azure-ptp.rules delete mode 100755 tests/kola/version/drop-azure-ptp diff --git a/overlay.d/25rhcos-azure-udev-rules/usr/lib/udev/rules.d/50-azure-ptp.rules b/overlay.d/25rhcos-azure-udev-rules/usr/lib/udev/rules.d/50-azure-ptp.rules deleted file mode 100644 index 32660fbee..000000000 --- a/overlay.d/25rhcos-azure-udev-rules/usr/lib/udev/rules.d/50-azure-ptp.rules +++ /dev/null @@ -1,5 +0,0 @@ -# Manual backport of: -# https://github.com/systemd/systemd/commit/32e868f058da8b90add00b2958c516241c532b70 -# Can drop once we get to RHEL 8.6: -# https://bugzilla.redhat.com/show_bug.cgi?id=1991834 -SUBSYSTEM=="ptp", ATTR{clock_name}=="hyperv", SYMLINK += "ptp_hyperv" diff --git a/tests/kola/version/drop-azure-ptp b/tests/kola/version/drop-azure-ptp deleted file mode 100755 index 6e0fb1cd0..000000000 --- a/tests/kola/version/drop-azure-ptp +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# kola: { "exclusive": false } -set -xeuo pipefail - -fatal() { - echo "$@" >&2 - exit 1 -} - -if [ -e /usr/lib/udev/rules.d/50-azure-ptp.rules ] && \ - grep ptp_hyperv /usr/lib/udev/rules.d/50-udev-default.rules; then - fatal "50-udev-default.rules includes ptp_hyperv symlink; drop 50-azure-ptp.rules" -fi From d53404b1ea427be814cb15d1f5b242b1c8de85a1 Mon Sep 17 00:00:00 2001 From: Huijing Hei Date: Mon, 28 Mar 2022 11:22:16 +0800 Subject: [PATCH 3/4] ci: Temporarily using 8.6 Beta repos --- ci/prow-build-test-qemu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/prow-build-test-qemu.sh b/ci/prow-build-test-qemu.sh index f05333b03..db8ae3e6a 100755 --- a/ci/prow-build-test-qemu.sh +++ b/ci/prow-build-test-qemu.sh @@ -32,7 +32,7 @@ ocpver_mut=$(rpm-ostree compose tree --print-only src/config/manifest.yaml | jq prev_build_url=${REDIRECTOR_URL}/rhcos-${ocpver}/ # we want to use RHEL 8.5 for testing until we can start using 8.6 # see https://github.com/openshift/release/pull/26193 -curl -L http://base-"${ocpver_mut}"-rhel85.ocp.svc.cluster.local > src/config/ocp.repo +curl -L http://base-"${ocpver_mut}"-rhel86.ocp.svc.cluster.local > src/config/ocp.repo cosa buildfetch --url=${prev_build_url} cosa fetch cosa build From 9153cce40c14abf97c94acbbb52164f5c7cdfc68 Mon Sep 17 00:00:00 2001 From: Huijing Hei Date: Wed, 30 Mar 2022 10:37:12 +0800 Subject: [PATCH 4/4] ci: Temporarily exclude Secure Boot testing Pre-release RHEL kernels and bootloaders are signed with non production Secure Boot keys and we do not have support for custom key testing in kola yet so ignore those test iuntil RHEL 8.6 is GA. --- ci/prow-build-test-qemu.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/prow-build-test-qemu.sh b/ci/prow-build-test-qemu.sh index db8ae3e6a..a5bbb6202 100755 --- a/ci/prow-build-test-qemu.sh +++ b/ci/prow-build-test-qemu.sh @@ -37,7 +37,12 @@ cosa buildfetch --url=${prev_build_url} cosa fetch cosa build cosa buildextend-extensions -cosa kola --basic-qemu-scenarios +# Manually exclude Secure Boot testing for pre-release RHEL content. +# This will be removed once RHEL 8.6 is GA. +# See https://github.com/openshift/os/pull/756 +# cosa kola --basic-qemu-scenarios +cosa kola run --qemu-nvme=true basic +cosa kola run --qemu-firmware=uefi basic kola run-upgrade -b rhcos -v --find-parent-image --qemu-image-dir tmp/ --output-dir tmp/kola-upgrade cosa kola run --parallel 2 # Build metal + installer now so we can test them