Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions ci/prow-build-test-qemu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,17 @@ 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
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
Expand Down
2 changes: 1 addition & 1 deletion manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ repos:
rpmdb: bdb

# We include hours/minutes to avoid version number reuse
automatic-version-prefix: "411.85.<date:%Y%m%d%H%M>"
automatic-version-prefix: "411.86.<date:%Y%m%d%H%M>"
# This ensures we're semver-compatible which OpenShift wants
automatic-version-suffix: "-"
# Keep this is sync with the version in postprocess
Expand Down

This file was deleted.

13 changes: 0 additions & 13 deletions tests/kola/version/drop-azure-ptp

This file was deleted.