From 866f7be0a024f6be810b87aef76050f7d2d7753a Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Tue, 17 May 2022 17:53:33 -0700 Subject: [PATCH 1/3] support default override with ENV var on command line --- run-openqa-tests.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/run-openqa-tests.sh b/run-openqa-tests.sh index 109257b1..7fb0ac28 100755 --- a/run-openqa-tests.sh +++ b/run-openqa-tests.sh @@ -1,10 +1,10 @@ #!/bin/bash set -e -ROCKY_FLAVOR=$1 -ROCKY_VERSION=8.5 -ROCKY_ARCH=x86_64 -ROCKY_PACKAGE_SET=minimal +ROCKY_FLAVOR="${ROCKY_FLAVOR:-boot-iso}" +ROCKY_VERSION="${ROCKY_VERSION:-8.6}" +ROCKY_ARCH="${ROCKY_ARCH:=x86_64}" +ROCKY_PACKAGE_SET="${ROCKY_PACKAGE_SET:=minimal}" BUILD_PREFIX="${ROCKY_VERSION}_${ROCKY_FLAVOR}" BUILD_NAME="${BUILD_PREFIX}_$(date +%Y%m%d.%H%M%S).0" -- 2.43.5 From 245ac5842ba7de8c83549f064203eef2eb9277a1 Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Tue, 17 May 2022 17:54:23 -0700 Subject: [PATCH 2/3] output PS4 as # character instead of + --- run-openqa-tests.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/run-openqa-tests.sh b/run-openqa-tests.sh index 7fb0ac28..185ff28a 100755 --- a/run-openqa-tests.sh +++ b/run-openqa-tests.sh @@ -1,4 +1,5 @@ #!/bin/bash + set -e ROCKY_FLAVOR="${ROCKY_FLAVOR:-boot-iso}" @@ -19,6 +20,7 @@ else exit 1 fi +export PS4='# ' set -o xtrace openqa-cli api \ -X POST isos \ -- 2.43.5 From 9868436cc6f7b34f18f730f91ebf86cd108a4a6c Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Tue, 17 May 2022 17:55:19 -0700 Subject: [PATCH 3/3] support additional options for POST via commandline ENV var --- run-openqa-tests.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/run-openqa-tests.sh b/run-openqa-tests.sh index 185ff28a..1b2d0cbc 100755 --- a/run-openqa-tests.sh +++ b/run-openqa-tests.sh @@ -6,6 +6,7 @@ ROCKY_FLAVOR="${ROCKY_FLAVOR:-boot-iso}" ROCKY_VERSION="${ROCKY_VERSION:-8.6}" ROCKY_ARCH="${ROCKY_ARCH:=x86_64}" ROCKY_PACKAGE_SET="${ROCKY_PACKAGE_SET:=minimal}" +ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}" BUILD_PREFIX="${ROCKY_VERSION}_${ROCKY_FLAVOR}" BUILD_NAME="${BUILD_PREFIX}_$(date +%Y%m%d.%H%M%S).0" @@ -31,4 +32,5 @@ openqa-cli api \ VERSION="$ROCKY_VERSION" \ BUILD="$BUILD_NAME" \ PACKAGE_SET="$ROCKY_PACKAGE_SET" \ - IDENTIFICATION=false + IDENTIFICATION=false \ + "${ROCKY_EXTRA_ARGS}" -- 2.43.5