particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust tests for new distros

Browse source 
References:
- https://redhat-internal.slack.com/archives/C0235DZB0DT/p1685528139831589
- 1fbd9d975f
This commit is contained in:
Alexander Todorov 2023-05-05 16:16:26 +03:00 • committed by Jakub Rusz
parent 4aff9076ea
commit 1f28e50d21
9 changed files with 55 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/cases/oscap.sh
View file

@ -77,12 +77,12 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa
SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
case "${ID}-${VERSION_ID}" in
"rhel-8.8")
"rhel-8"* )
OS_VARIANT="rhel8-unknown"
PROFILE="xccdf_org.ssgproject.content_profile_cis"
DATASTREAM="/usr/share/xml/scap/ssg/content/ssg-rhel8-ds.xml"
;;
"rhel-9.2")
"rhel-9"* )
OS_VARIANT="rhel9-unknown"
PROFILE="xccdf_org.ssgproject.content_profile_cis"
DATASTREAM="/usr/share/xml/scap/ssg/content/ssg-rhel9-ds.xml"

4
test/cases/ostree-ng.sh
View file

@ -126,13 +126,13 @@ case "${ID}-${VERSION_ID}" in
DIRS_FILES_CUSTOMIZATION="true"
SYSROOT_RO="true"
;;
"rhel-8.8")
"rhel-8"* )
OSTREE_REF="test/rhel/8/${ARCH}/edge"
OS_VARIANT="rhel8-unknown"
EMBEDED_CONTAINER="true"
DIRS_FILES_CUSTOMIZATION="true"
;;
"rhel-9.2")
"rhel-9"* )
OSTREE_REF="test/rhel/9/${ARCH}/edge"
OS_VARIANT="rhel9-unknown"
EMBEDED_CONTAINER="true"

4
test/cases/ostree-raw-image.sh
View file

@ -98,11 +98,11 @@ SYSROOT_RO="false"
CUSTOM_DIRS_FILES="false"
case "${ID}-${VERSION_ID}" in
"rhel-8.8")
"rhel-8"* )
OSTREE_REF="rhel/8/${ARCH}/edge"
OS_VARIANT="rhel8-unknown"
;;
"rhel-9.2")
"rhel-9"* )
OSTREE_REF="rhel/9/${ARCH}/edge"
OS_VARIANT="rhel9-unknown"
SYSROOT_RO="true"

8
test/cases/ostree-rebase-bios.sh
View file

@ -88,21 +88,21 @@ KERNEL_RT_PKG="kernel-rt"
SYSROOT_RO="false"
case "${ID}-${VERSION_ID}" in
"rhel-8.8")
"rhel-8"* )
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.7.0/BaseOS/x86_64/os/"
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.8.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.2")
"rhel-9"* )
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-9/RHEL-9/9.1.0/BaseOS/x86_64/os/"
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.2.0/BaseOS/x86_64/os/"
if [ "${NIGHTLY:=false}" == "true" ]; then
BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
fi

8
test/cases/ostree-rebase-uefi.sh
View file

@ -93,21 +93,21 @@ KERNEL_RT_PKG="kernel-rt"
SYSROOT_RO="false"
case "${ID}-${VERSION_ID}" in
"rhel-8.8")
"rhel-8"* )
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.7.0/BaseOS/x86_64/os/"
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-8/RHEL-8/8.8.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.2")
"rhel-9"* )
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-9/RHEL-9/9.1.0/BaseOS/x86_64/os/"
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.2.0/BaseOS/x86_64/os/"
if [ "${NIGHTLY:=false}" == "true" ]; then
BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
fi

4
test/cases/ostree-simplified-installer.sh
View file

@ -117,11 +117,11 @@ ANSIBLE_USER="admin"
FDO_USER_ONBOARDING="false"
case "${ID}-${VERSION_ID}" in
"rhel-8.8")
"rhel-8"* )
OSTREE_REF="rhel/8/${ARCH}/edge"
OS_VARIANT="rhel8-unknown"
;;
"rhel-9.2")
"rhel-9"* )
OSTREE_REF="rhel/9/${ARCH}/edge"
OS_VARIANT="rhel9-unknown"
SYSROOT_RO="true"

32
test/cases/ostree.sh
View file

@ -71,6 +71,22 @@ case "${ID}-${VERSION_ID}" in
DIRS_FILES_CUSTOMIZATION="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.8.0/BaseOS/x86_64/os/"
if [ "${NIGHTLY:=false}" == "true" ]; then
BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
fi
;;
"rhel-8.9")
IMAGE_TYPE=edge-commit
OSTREE_REF="rhel/8/${ARCH}/edge"
OS_VARIANT="rhel8-unknown"
USER_IN_COMMIT="true"
EMBEDED_CONTAINER="true"
FIREWALL_FEATURE="true"
DIRS_FILES_CUSTOMIZATION="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.8.0/BaseOS/x86_64/os/"
if [ "${NIGHTLY:=false}" == "true" ]; then
@ -97,6 +113,22 @@ case "${ID}-${VERSION_ID}" in
DIRS_FILES_CUSTOMIZATION="true"
SYSROOT_RO="true"
# Use a stable installer image unless it's the nightly pipeline
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.2.0/BaseOS/x86_64/os/"
if [ "${NIGHTLY:=false}" == "true" ]; then
BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
fi
;;
"rhel-9.3")
IMAGE_TYPE=edge-commit
OSTREE_REF="rhel/9/${ARCH}/edge"
OS_VARIANT="rhel9-unknown"
USER_IN_COMMIT="true"
EMBEDED_CONTAINER="true"
FIREWALL_FEATURE="true"
DIRS_FILES_CUSTOMIZATION="true"
SYSROOT_RO="true"
# Use a stable installer image unless it's the nightly pipeline
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.2.0/BaseOS/x86_64/os/"
if [ "${NIGHTLY:=false}" == "true" ]; then

5
test/cases/vmware.sh
View file

@ -15,6 +15,11 @@ source /usr/libexec/tests/osbuild-composer/shared_lib.sh
IMAGE_TYPE="$1"
if ! nvrGreaterOrEqual "osbuild" "85" && [ "$IMAGE_TYPE" == "ova" ]; then
greenprint "Skipping ova test on older osbuild-composer"
exit 0
fi
# Provision the software under test.
/usr/libexec/osbuild-composer-test/provision.sh none