tests/ostree: Update to support new RHEL nightlies
This commit is contained in:
parent
1829ff24ea
commit
5fcf0b1d53
5 changed files with 26 additions and 12 deletions
|
|
@ -114,11 +114,11 @@ case "${ID}-${VERSION_ID}" in
|
|||
OSTREE_OSNAME=fedora
|
||||
OS_VARIANT="fedora35"
|
||||
;;
|
||||
"rhel-8.6")
|
||||
"rhel-8.7")
|
||||
OSTREE_REF="test/rhel/8/${ARCH}/edge"
|
||||
OS_VARIANT="rhel8-unknown"
|
||||
;;
|
||||
"rhel-9.0")
|
||||
"rhel-9.1")
|
||||
OSTREE_REF="test/rhel/9/${ARCH}/edge"
|
||||
OS_VARIANT="rhel9-unknown"
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -96,11 +96,11 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa
|
|||
SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
|
||||
|
||||
case "${ID}-${VERSION_ID}" in
|
||||
"rhel-8.6")
|
||||
"rhel-8.7")
|
||||
OSTREE_REF="rhel/8/${ARCH}/edge"
|
||||
OS_VARIANT="rhel8-unknown"
|
||||
;;
|
||||
"rhel-9.0")
|
||||
"rhel-9.1")
|
||||
OSTREE_REF="rhel/9/${ARCH}/edge"
|
||||
OS_VARIANT="rhel9-unknown"
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -97,21 +97,21 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa
|
|||
SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
|
||||
|
||||
case "${ID}-${VERSION_ID}" in
|
||||
"rhel-8.6")
|
||||
"rhel-8.7")
|
||||
OSTREE_REF="rhel/8/${ARCH}/edge"
|
||||
OS_VARIANT="rhel8-unknown"
|
||||
# Use a stable installer image unless it's the nightly pipeline
|
||||
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.5.0/BaseOS/x86_64/os/"
|
||||
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.6.0/BaseOS/x86_64/os/"
|
||||
if [ "${NIGHTLY:=false}" == "true" ]; then
|
||||
BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
|
||||
fi
|
||||
PARENT_REF="rhel/8/${ARCH}/edge"
|
||||
;;
|
||||
"rhel-9.0")
|
||||
"rhel-9.1")
|
||||
OSTREE_REF="rhel/9/${ARCH}/edge"
|
||||
OS_VARIANT="rhel9-unknown"
|
||||
# Use a stable installer image unless it's the nightly pipeline
|
||||
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.5.0/BaseOS/x86_64/os/"
|
||||
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.0.0/BaseOS/x86_64/os/"
|
||||
if [ "${NIGHTLY:=false}" == "true" ]; then
|
||||
BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -114,11 +114,11 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa
|
|||
SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
|
||||
|
||||
case "${ID}-${VERSION_ID}" in
|
||||
"rhel-8.6")
|
||||
"rhel-8.7")
|
||||
OSTREE_REF="rhel/8/${ARCH}/edge"
|
||||
OS_VARIANT="rhel8-unknown"
|
||||
;;
|
||||
"rhel-9.0")
|
||||
"rhel-9.1")
|
||||
OSTREE_REF="rhel/9/${ARCH}/edge"
|
||||
OS_VARIANT="rhel9-unknown"
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -33,9 +33,16 @@ case "${ID}-${VERSION_ID}" in
|
|||
OSTREE_REF="rhel/8/${ARCH}/edge"
|
||||
OS_VARIANT="rhel8-unknown"
|
||||
USER_IN_COMMIT="true"
|
||||
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.6.0/BaseOS/x86_64/os/"
|
||||
;;
|
||||
"rhel-8.7")
|
||||
IMAGE_TYPE=edge-commit
|
||||
OSTREE_REF="rhel/8/${ARCH}/edge"
|
||||
OS_VARIANT="rhel8-unknown"
|
||||
USER_IN_COMMIT="true"
|
||||
|
||||
# Use a stable installer image unless it's the nightly pipeline
|
||||
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.5.0/BaseOS/x86_64/os/"
|
||||
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.6.0/BaseOS/x86_64/os/"
|
||||
if [ "${NIGHTLY:=false}" == "true" ]; then
|
||||
BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
|
||||
fi
|
||||
|
|
@ -45,9 +52,16 @@ case "${ID}-${VERSION_ID}" in
|
|||
OSTREE_REF="rhel/9/${ARCH}/edge"
|
||||
OS_VARIANT="rhel9.0"
|
||||
USER_IN_COMMIT="true"
|
||||
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.0.0/BaseOS/x86_64/os/"
|
||||
;;
|
||||
"rhel-9.1")
|
||||
IMAGE_TYPE=edge-commit
|
||||
OSTREE_REF="rhel/9/${ARCH}/edge"
|
||||
OS_VARIANT="rhel9-unknown"
|
||||
USER_IN_COMMIT="true"
|
||||
|
||||
# Use a stable installer image unless it's the nightly pipeline
|
||||
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.5.0/BaseOS/x86_64/os/"
|
||||
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.0.0/BaseOS/x86_64/os/"
|
||||
if [ "${NIGHTLY:=false}" == "true" ]; then
|
||||
BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue