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

Replace 9.4 conditions with 9.5 conditions inside test scripts

Browse source
This commit is contained in:
Alexander Todorov 2024-05-03 13:31:48 +03:00 • committed by Alexander Todorov
parent 4bee7cffb9
commit 8d0eb8b0cb
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/cases/koji.sh
View file

@ -354,7 +354,7 @@ koji --server="${KOJI_HUB_URL}" --user kojiadmin --password kojipass --authtype=
if [[ "$DISTRO_CODE" == rhel-8* ]]; then
DISTRO_CODE=rhel-8.10
elif [[ "$DISTRO_CODE" == rhel-9* ]]; then
DISTRO_CODE=rhel-9.4
DISTRO_CODE=rhel-9.5
fi
case ${TEST_TYPE} in

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

@ -33,7 +33,7 @@ do
done
# Prepare service api server config filef
sudo /usr/local/bin/yq -iy '.service_info.diskencryption_clevis |= [{disk_label: "/dev/vda4", reencrypt: true, binding: {pin: "tpm2", config: "{}"}}]' /etc/fdo/aio/configs/serviceinfo_api_server.yml
if [[ "$VERSION_ID" == "9.4" || "$VERSION_ID" == "9" ]]; then
if [[ "$VERSION_ID" == "9.5" || "$VERSION_ID" == "9" ]]; then
# Modify manufacturing server config to process fdo
# guest interface during onboarding
sudo sed -i 's/SerialNumber/MACAddress/g' /etc/fdo/aio/configs/manufacturing_server.yml
@ -615,7 +615,7 @@ manufacturing_server_url="http://${FDO_SERVER_ADDRESS}:8080"
diun_pub_key_insecure="true"
EOF
if [[ "$VERSION_ID" == "9.4" || "$VERSION_ID" == "9" ]]; then
if [[ "$VERSION_ID" == "9.5" || "$VERSION_ID" == "9" ]]; then
tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
di_mfg_string_type_mac_iface="${MFG_GUEST_INT_NAME}"
EOF
@ -800,7 +800,7 @@ manufacturing_server_url="http://${FDO_SERVER_ADDRESS}:8080"
diun_pub_key_hash="${DIUN_PUB_KEY_HASH}"
EOF
if [[ "$VERSION_ID" == "9.4" || "$VERSION_ID" == "9" ]]; then
if [[ "$VERSION_ID" == "9.5" || "$VERSION_ID" == "9" ]]; then
tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
di_mfg_string_type_mac_iface="${MFG_GUEST_INT_NAME}"
EOF
@ -1133,7 +1133,7 @@ diun_pub_key_root_certs="""
${DIUN_PUB_KEY_ROOT_CERTS}"""
EOF
if [[ "$VERSION_ID" == "9.4" || "$VERSION_ID" == "9" ]]; then
if [[ "$VERSION_ID" == "9.5" || "$VERSION_ID" == "9" ]]; then
tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
di_mfg_string_type_mac_iface="${MFG_GUEST_INT_NAME}"
EOF

4
test/cases/ostree.sh
View file

@ -56,7 +56,7 @@ case "${ID}-${VERSION_ID}" in
BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
fi
;;
"rhel-9.4")
"rhel-9.5")
IMAGE_TYPE=edge-commit
OSTREE_REF="rhel/9/${ARCH}/edge"
OS_VARIANT="rhel9-unknown"
@ -67,7 +67,7 @@ case "${ID}-${VERSION_ID}" in
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.3.0/BaseOS/x86_64/os/"
BOOT_LOCATION="http://download.devel.redhat.com/released/rhel-9/RHEL-9/9.4.0/BaseOS/x86_64/os/"
if [ "${NIGHTLY:=false}" == "true" ]; then
BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/"
fi