testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Consolidate build names for all flavors by version

Browse Source 
This PR neither adds nor updates specific test functionality, but does
update the wrapper scripts based on @tcooper's recommendations for
consolidating all flavors for a particular version into a single build.
This commit is contained in:
Al Bowles 2023-05-11 20:35:00 -05:00
parent 40b44c42dc
commit 1e53d13cfe
No known key found for this signature in database
GPG Key ID: 9B42314A30F1A3D1
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
scripts/run-all-flavors.sh
View File

@ -1,16 +1,18 @@
#!/bin/bash #!/bin/bash
set -e set -e
MAJOR_VERSION=9
MINOR_VERSION=0
## Usage: Posts ISOs to openQA for each of the universal, dvd-iso, package-set, minimal-iso, and boot-iso FLAVORs. ## Usage: Posts ISOs to openQA for each of the universal, dvd-iso, package-set, minimal-iso, and boot-iso FLAVORs.
# scripts/run-all-flavors.sh # scripts/run-all-flavors.sh
# Test a beta build with alternative repo URL
# ROCKY_EXTRA_ARGS="GRUB=ip=dhcp GRUBADD=inst.repo=https://dl.rockylinux.org/stg/rocky/8.8-BETA/BaseOS/x86_64/os DNF_CONTENTDIR=stg CURRREL=8 IDENTIFICATION=false" scripts/run-all-flavors.sh
ROCKY_VERSION="$MAJOR_VERSION.$MINOR_VERSION" ROCKY_VERSION="9.2"
MAJOR_VERSION=$(awk -F '.' '{print $1}' <<< $ROCKY_VERSION)
MINOR_VERSION=$(awk -F '.' '{print $2}' <<< $ROCKY_VERSION)
ROCKY_ARCH="${ROCKY_ARCH:=x86_64}" ROCKY_ARCH="${ROCKY_ARCH:=x86_64}"
ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}" ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}"
BUILD_PREFIX="-$(date +%Y%m%d.%H%M%S).0-$(git branch --show-current)" BUILD_NAME="-$(date +%Y%m%d).0-$(git branch --show-current)-$ROCKY_VERSION"
ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH" ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH"
DVD_ISOTYPE=dvd1 DVD_ISOTYPE=dvd1
@ -31,8 +33,8 @@ openqa-cli api \
DISTRI=rocky \ DISTRI=rocky \
FLAVOR=universal \ FLAVOR=universal \
VERSION="$ROCKY_VERSION" \ VERSION="$ROCKY_VERSION" \
BUILD="$BUILD_PREFIX-universal-$ROCKY_VERSION" \ BUILD="$BUILD_NAME" \
"${ROCKY_EXTRA_ARGS}" ${ROCKY_EXTRA_ARGS}
openqa-cli api \ openqa-cli api \
-X POST isos \ -X POST isos \
@ -41,8 +43,8 @@ openqa-cli api \
DISTRI=rocky \ DISTRI=rocky \
FLAVOR="dvd-iso" \ FLAVOR="dvd-iso" \
VERSION="$ROCKY_VERSION" \ VERSION="$ROCKY_VERSION" \
BUILD="$BUILD_PREFIX-dvd-$ROCKY_VERSION" \ BUILD="$BUILD_NAME" \
"${ROCKY_EXTRA_ARGS}" ${ROCKY_EXTRA_ARGS}
openqa-cli api \ openqa-cli api \
-X POST isos \ -X POST isos \
@ -51,8 +53,8 @@ openqa-cli api \
DISTRI=rocky \ DISTRI=rocky \
FLAVOR=package-set \ FLAVOR=package-set \
VERSION="$ROCKY_VERSION" \ VERSION="$ROCKY_VERSION" \
BUILD="$BUILD_PREFIX-packageset-$ROCKY_VERSION" \ BUILD="$BUILD_NAME" \
"${ROCKY_EXTRA_ARGS}" ${ROCKY_EXTRA_ARGS}
openqa-cli api \ openqa-cli api \
-X POST isos \ -X POST isos \
@ -61,8 +63,8 @@ openqa-cli api \
DISTRI=rocky \ DISTRI=rocky \
FLAVOR=minimal-iso \ FLAVOR=minimal-iso \
VERSION="$ROCKY_VERSION" \ VERSION="$ROCKY_VERSION" \
BUILD="$BUILD_PREFIX-minimal-$ROCKY_VERSION" \ BUILD="$BUILD_NAME" \
"${ROCKY_EXTRA_ARGS}" ${ROCKY_EXTRA_ARGS}
openqa-cli api \ openqa-cli api \
-X POST isos \ -X POST isos \
@ -71,5 +73,5 @@ openqa-cli api \
DISTRI=rocky \ DISTRI=rocky \
FLAVOR=boot-iso \ FLAVOR=boot-iso \
VERSION="$ROCKY_VERSION" \ VERSION="$ROCKY_VERSION" \
BUILD="$BUILD_PREFIX-boot-$ROCKY_VERSION" \ BUILD="$BUILD_NAME" \
"${ROCKY_EXTRA_ARGS}" ${ROCKY_EXTRA_ARGS}

12
scripts/run-openqa-tests.sh
View File

@ -1,9 +1,6 @@
#!/bin/bash #!/bin/bash
set -e set -e
MAJOR_VERSION=9
MINOR_VERSION=0
## Usage: Post an ISO for the specified FLAVOR. Defaults to boot-iso. ## Usage: Post an ISO for the specified FLAVOR. Defaults to boot-iso.
# #
## Run the boot-iso FLAVOR ## Run the boot-iso FLAVOR
@ -15,13 +12,14 @@ MINOR_VERSION=0
## Run the localization test suites ## Run the localization test suites
# ROCKY_FLAVOR ROCKY_EXTRA_ARGS=TEST=install_arabic_language,install_asian_language,install_european_language,install_cyrillic_language scripts/run-openqa-tests.sh # ROCKY_FLAVOR ROCKY_EXTRA_ARGS=TEST=install_arabic_language,install_asian_language,install_european_language,install_cyrillic_language scripts/run-openqa-tests.sh
ROCKY_VERSION="9.2"
MAJOR_VERSION=$(awk -F '.' '{print $1}' <<< $ROCKY_VERSION)
MINOR_VERSION=$(awk -F '.' '{print $2}' <<< $ROCKY_VERSION)
ROCKY_FLAVOR="${ROCKY_FLAVOR:-boot-iso}" ROCKY_FLAVOR="${ROCKY_FLAVOR:-boot-iso}"
ROCKY_VERSION="$MAJOR_VERSION.$MINOR_VERSION"
ROCKY_ARCH="${ROCKY_ARCH:=x86_64}" ROCKY_ARCH="${ROCKY_ARCH:=x86_64}"
ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}" ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}"
BUILD_PREFIX="-$(date +%Y%m%d.%H%M%S).0-$(git branch --show-current)" BUILD_NAME="-$(date +%Y%m%d).0-$(git branch --show-current)-$ROCKY_VERSION"
BUILD_NAME="$BUILD_PREFIX-$ROCKY_FLAVOR-$ROCKY_VERSION"
ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH" ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH"
if [[ "$ROCKY_FLAVOR" == "dvd-iso" || "$ROCKY_FLAVOR" == "universal" ]]; then if [[ "$ROCKY_FLAVOR" == "dvd-iso" || "$ROCKY_FLAVOR" == "universal" ]]; then