diff --git a/needles/rocky-anaconda_help_keyboard_layout-20230504.json b/needles/anaconda/help/rocky-anaconda_help_keyboard_layout-20230504.json similarity index 100% rename from needles/rocky-anaconda_help_keyboard_layout-20230504.json rename to needles/anaconda/help/rocky-anaconda_help_keyboard_layout-20230504.json diff --git a/needles/rocky-anaconda_help_keyboard_layout-20230504.png b/needles/anaconda/help/rocky-anaconda_help_keyboard_layout-20230504.png similarity index 100% rename from needles/rocky-anaconda_help_keyboard_layout-20230504.png rename to needles/anaconda/help/rocky-anaconda_help_keyboard_layout-20230504.png diff --git a/needles/rocky-anaconda_help_language_support-20230504.json b/needles/anaconda/help/rocky-anaconda_help_language_support-20230504.json similarity index 100% rename from needles/rocky-anaconda_help_language_support-20230504.json rename to needles/anaconda/help/rocky-anaconda_help_language_support-20230504.json diff --git a/needles/rocky-anaconda_help_language_support-20230504.png b/needles/anaconda/help/rocky-anaconda_help_language_support-20230504.png similarity index 100% rename from needles/rocky-anaconda_help_language_support-20230504.png rename to needles/anaconda/help/rocky-anaconda_help_language_support-20230504.png diff --git a/needles/rocky-anaconda_help_localization_link-20230504.json b/needles/anaconda/help/rocky-anaconda_help_localization_link-20230504.json similarity index 100% rename from needles/rocky-anaconda_help_localization_link-20230504.json rename to needles/anaconda/help/rocky-anaconda_help_localization_link-20230504.json diff --git a/needles/rocky-anaconda_help_localization_link-20230504.png b/needles/anaconda/help/rocky-anaconda_help_localization_link-20230504.png similarity index 100% rename from needles/rocky-anaconda_help_localization_link-20230504.png rename to needles/anaconda/help/rocky-anaconda_help_localization_link-20230504.png diff --git a/needles/anaconda/help/rocky-anaconda_help_localization_link-20230513.json b/needles/anaconda/help/rocky-anaconda_help_localization_link-20230513.json new file mode 100644 index 00000000..0740ce76 --- /dev/null +++ b/needles/anaconda/help/rocky-anaconda_help_localization_link-20230513.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 66, + "ypos": 295, + "width": 441, + "type": "match", + "height": 20 + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "ENV-LANGUAGE-english", + "anaconda_help_localization_link" + ] +} \ No newline at end of file diff --git a/needles/anaconda/help/rocky-anaconda_help_localization_link-20230513.png b/needles/anaconda/help/rocky-anaconda_help_localization_link-20230513.png new file mode 100644 index 00000000..d6dbd8e0 Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_localization_link-20230513.png differ diff --git a/needles/rocky-anaconda_help_time_date-20230504.json b/needles/anaconda/help/rocky-anaconda_help_time_date-20230504.json similarity index 100% rename from needles/rocky-anaconda_help_time_date-20230504.json rename to needles/anaconda/help/rocky-anaconda_help_time_date-20230504.json diff --git a/needles/rocky-anaconda_help_time_date-20230504.png b/needles/anaconda/help/rocky-anaconda_help_time_date-20230504.png similarity index 100% rename from needles/rocky-anaconda_help_time_date-20230504.png rename to needles/anaconda/help/rocky-anaconda_help_time_date-20230504.png diff --git a/needles/rocky-help_language_selection-20230504.json b/needles/anaconda/help/rocky-help_language_selection-20230504.json similarity index 100% rename from needles/rocky-help_language_selection-20230504.json rename to needles/anaconda/help/rocky-help_language_selection-20230504.json diff --git a/needles/rocky-help_language_selection-20230504.png b/needles/anaconda/help/rocky-help_language_selection-20230504.png similarity index 100% rename from needles/rocky-help_language_selection-20230504.png rename to needles/anaconda/help/rocky-help_language_selection-20230504.png diff --git a/needles/anaconda/install_process/arabic/rocky-anaconda_install_user_created-20230513.json b/needles/anaconda/install_process/arabic/rocky-anaconda_install_user_created-20230513.json new file mode 100644 index 00000000..3fa50bd1 --- /dev/null +++ b/needles/anaconda/install_process/arabic/rocky-anaconda_install_user_created-20230513.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "width": 36, + "ypos": 145, + "xpos": 250, + "height": 11, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-arabic", + "anaconda_install_user_created" + ] +} \ No newline at end of file diff --git a/needles/anaconda/install_process/arabic/rocky-anaconda_install_user_created-20230513.png b/needles/anaconda/install_process/arabic/rocky-anaconda_install_user_created-20230513.png new file mode 100644 index 00000000..9fc531f1 Binary files /dev/null and b/needles/anaconda/install_process/arabic/rocky-anaconda_install_user_created-20230513.png differ diff --git a/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20230513.json b/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20230513.json new file mode 100644 index 00000000..79e50ba9 --- /dev/null +++ b/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20230513.json @@ -0,0 +1,24 @@ +{ + "area": [ + { + "ypos": 634, + "xpos": 716, + "width": 305, + "height": 14, + "type": "match" + }, + { + "type": "match", + "height": 14, + "ypos": 698, + "width": 105, + "xpos": 875 + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-japanese", + "anaconda_install_done" + ] +} \ No newline at end of file diff --git a/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20230513.png b/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20230513.png new file mode 100644 index 00000000..06fabfd1 Binary files /dev/null and b/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20230513.png differ diff --git a/needles/anaconda/install_process/russian/rocky-anaconda_install_user_created-20230513.json b/needles/anaconda/install_process/russian/rocky-anaconda_install_user_created-20230513.json new file mode 100644 index 00000000..af575995 --- /dev/null +++ b/needles/anaconda/install_process/russian/rocky-anaconda_install_user_created-20230513.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 398, + "ypos": 145, + "width": 36, + "type": "match", + "height": 11 + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-russian", + "anaconda_install_user_created" + ] +} \ No newline at end of file diff --git a/needles/anaconda/install_process/russian/rocky-anaconda_install_user_created-20230513.png b/needles/anaconda/install_process/russian/rocky-anaconda_install_user_created-20230513.png new file mode 100644 index 00000000..21775bae Binary files /dev/null and b/needles/anaconda/install_process/russian/rocky-anaconda_install_user_created-20230513.png differ diff --git a/needles/anaconda/main_hub/arabic/rocky-anaconda_main_hub_network_host_name_connected-20230513.json b/needles/anaconda/main_hub/arabic/rocky-anaconda_main_hub_network_host_name_connected-20230513.json new file mode 100644 index 00000000..eaf7c1c4 --- /dev/null +++ b/needles/anaconda/main_hub/arabic/rocky-anaconda_main_hub_network_host_name_connected-20230513.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 224, + "ypos": 361, + "width": 45, + "height": 11, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-arabic", + "anaconda_network_connected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/main_hub/arabic/rocky-anaconda_main_hub_network_host_name_connected-20230513.png b/needles/anaconda/main_hub/arabic/rocky-anaconda_main_hub_network_host_name_connected-20230513.png new file mode 100644 index 00000000..0baa91cb Binary files /dev/null and b/needles/anaconda/main_hub/arabic/rocky-anaconda_main_hub_network_host_name_connected-20230513.png differ diff --git a/needles/anaconda/main_hub/french/rocky-anaconda_main_hub_network_host_name_connected-20230513.json b/needles/anaconda/main_hub/french/rocky-anaconda_main_hub_network_host_name_connected-20230513.json new file mode 100644 index 00000000..6b50e703 --- /dev/null +++ b/needles/anaconda/main_hub/french/rocky-anaconda_main_hub_network_host_name_connected-20230513.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 783, + "ypos": 364, + "width": 60, + "height": 10, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-french", + "anaconda_network_connected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/main_hub/french/rocky-anaconda_main_hub_network_host_name_connected-20230513.png b/needles/anaconda/main_hub/french/rocky-anaconda_main_hub_network_host_name_connected-20230513.png new file mode 100644 index 00000000..cfbd8dcc Binary files /dev/null and b/needles/anaconda/main_hub/french/rocky-anaconda_main_hub_network_host_name_connected-20230513.png differ diff --git a/needles/anaconda/main_hub/japanese/rocky-anaconda_main_hub_network_host_name_connected-20230513.json b/needles/anaconda/main_hub/japanese/rocky-anaconda_main_hub_network_host_name_connected-20230513.json new file mode 100644 index 00000000..72bf01f8 --- /dev/null +++ b/needles/anaconda/main_hub/japanese/rocky-anaconda_main_hub_network_host_name_connected-20230513.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 785, + "ypos": 362, + "width": 50, + "height": 10, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-japanese", + "anaconda_network_connected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/main_hub/japanese/rocky-anaconda_main_hub_network_host_name_connected-20230513.png b/needles/anaconda/main_hub/japanese/rocky-anaconda_main_hub_network_host_name_connected-20230513.png new file mode 100644 index 00000000..a47e3958 Binary files /dev/null and b/needles/anaconda/main_hub/japanese/rocky-anaconda_main_hub_network_host_name_connected-20230513.png differ diff --git a/needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name_connected-20230513.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name_connected-20230513.json new file mode 100644 index 00000000..36136d78 --- /dev/null +++ b/needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name_connected-20230513.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 719, + "height": 18, + "type": "match", + "ypos": 359, + "width": 105 + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "ENV-LANGUAGE-english", + "anaconda_network_connected" + ] +} diff --git a/needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name_connected-20230513.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name_connected-20230513.png new file mode 100644 index 00000000..39cceee8 Binary files /dev/null and b/needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name_connected-20230513.png differ diff --git a/needles/anaconda/main_hub/russian/rocky-anaconda_main_hub_network_host_name_connected-20230513.json b/needles/anaconda/main_hub/russian/rocky-anaconda_main_hub_network_host_name_connected-20230513.json new file mode 100644 index 00000000..34eb57d5 --- /dev/null +++ b/needles/anaconda/main_hub/russian/rocky-anaconda_main_hub_network_host_name_connected-20230513.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "xpos": 778, + "ypos": 364, + "width": 68, + "height": 10, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-russian", + "anaconda_network_connected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/main_hub/russian/rocky-anaconda_main_hub_network_host_name_connected-20230513.png b/needles/anaconda/main_hub/russian/rocky-anaconda_main_hub_network_host_name_connected-20230513.png new file mode 100644 index 00000000..f8232283 Binary files /dev/null and b/needles/anaconda/main_hub/russian/rocky-anaconda_main_hub_network_host_name_connected-20230513.png differ diff --git a/needles/anaconda/universal/arabic/rocky-spoke_done_arabic-untranslated-20230513.json b/needles/anaconda/universal/arabic/rocky-spoke_done_arabic-untranslated-20230513.json new file mode 100644 index 00000000..8e9b21b2 --- /dev/null +++ b/needles/anaconda/universal/arabic/rocky-spoke_done_arabic-untranslated-20230513.json @@ -0,0 +1,21 @@ +{ + "area": [ + { + "height": 21, + "type": "match", + "width": 42, + "xpos": 965, + "ypos": 34, + "click_point": { + "xpos": 21, + "ypos": 10.5 + } + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-arabic", + "anaconda_spoke_done" + ] +} \ No newline at end of file diff --git a/needles/anaconda/universal/arabic/rocky-spoke_done_arabic-untranslated-20230513.png b/needles/anaconda/universal/arabic/rocky-spoke_done_arabic-untranslated-20230513.png new file mode 100644 index 00000000..38cc246a Binary files /dev/null and b/needles/anaconda/universal/arabic/rocky-spoke_done_arabic-untranslated-20230513.png differ diff --git a/needles/anaconda/universal/russian/rocky-spoke_done_russian-20230513.json b/needles/anaconda/universal/russian/rocky-spoke_done_russian-20230513.json new file mode 100644 index 00000000..59edbed4 --- /dev/null +++ b/needles/anaconda/universal/russian/rocky-spoke_done_russian-20230513.json @@ -0,0 +1,20 @@ +{ + "area": [ + { + "width": 56, + "ypos": 34, + "xpos": 17, + "height": 21, + "type": "match", + "click_point": { + "xpos": 28, + "ypos": 10.5 + } + } + ], + "properties": [], + "tags": [ + "LANGUAGE-russian", + "anaconda_spoke_done" + ] +} \ No newline at end of file diff --git a/needles/anaconda/universal/russian/rocky-spoke_done_russian-20230513.png b/needles/anaconda/universal/russian/rocky-spoke_done_russian-20230513.png new file mode 100644 index 00000000..4932bba8 Binary files /dev/null and b/needles/anaconda/universal/russian/rocky-spoke_done_russian-20230513.png differ diff --git a/needles/console/rocky-boot_enter_passphrase-20230513.json b/needles/console/rocky-boot_enter_passphrase-20230513.json new file mode 100644 index 00000000..2c910f33 --- /dev/null +++ b/needles/console/rocky-boot_enter_passphrase-20230513.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "ypos": 618, + "xpos": 16, + "width": 143, + "height": 10, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "LANGUAGE-english", + "boot_enter_passphrase" + ] +} \ No newline at end of file diff --git a/needles/console/rocky-boot_enter_passphrase-20230513.png b/needles/console/rocky-boot_enter_passphrase-20230513.png new file mode 100644 index 00000000..0fc1ab36 Binary files /dev/null and b/needles/console/rocky-boot_enter_passphrase-20230513.png differ diff --git a/needles/console/rocky-bootloader_uefi-20230513.json b/needles/console/rocky-bootloader_uefi-20230513.json new file mode 100644 index 00000000..0b37a7c7 --- /dev/null +++ b/needles/console/rocky-bootloader_uefi-20230513.json @@ -0,0 +1,17 @@ +{ + "area": [ + { + "width": 113, + "ypos": 575, + "xpos": 427, + "type": "match", + "height": 19 + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "ENV-LANGUAGE-english", + "bootloader_uefi" + ] +} \ No newline at end of file diff --git a/needles/console/rocky-bootloader_uefi-20230513.png b/needles/console/rocky-bootloader_uefi-20230513.png new file mode 100644 index 00000000..580d87ab Binary files /dev/null and b/needles/console/rocky-bootloader_uefi-20230513.png differ diff --git a/needles/gnome/japanese/rocky-getting_started-20230513.json b/needles/gnome/japanese/rocky-getting_started-20230513.json new file mode 100644 index 00000000..692dca2f --- /dev/null +++ b/needles/gnome/japanese/rocky-getting_started-20230513.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "type": "match", + "height": 157, + "width": 163, + "ypos": 224, + "xpos": 445 + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "getting_started" + ] +} \ No newline at end of file diff --git a/needles/gnome/japanese/rocky-getting_started-20230513.png b/needles/gnome/japanese/rocky-getting_started-20230513.png new file mode 100644 index 00000000..091a0ace Binary files /dev/null and b/needles/gnome/japanese/rocky-getting_started-20230513.png differ diff --git a/scripts/run-all-flavors.sh b/scripts/run-all-flavors.sh index fc12e8d7..cda3a704 100755 --- a/scripts/run-all-flavors.sh +++ b/scripts/run-all-flavors.sh @@ -1,16 +1,18 @@ #!/bin/bash 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. # 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=${ROCKY_VERSION:0:1} +MINOR_VERSION=${ROCKY_VERSION:2:1} ROCKY_ARCH="${ROCKY_ARCH:=x86_64}" 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" DVD_ISOTYPE=dvd1 @@ -31,8 +33,8 @@ openqa-cli api \ DISTRI=rocky \ FLAVOR=universal \ VERSION="$ROCKY_VERSION" \ - BUILD="$BUILD_PREFIX-universal-$ROCKY_VERSION" \ - "${ROCKY_EXTRA_ARGS}" + BUILD="$BUILD_NAME" \ + ${ROCKY_EXTRA_ARGS} openqa-cli api \ -X POST isos \ @@ -41,8 +43,8 @@ openqa-cli api \ DISTRI=rocky \ FLAVOR="dvd-iso" \ VERSION="$ROCKY_VERSION" \ - BUILD="$BUILD_PREFIX-dvd-$ROCKY_VERSION" \ - "${ROCKY_EXTRA_ARGS}" + BUILD="$BUILD_NAME" \ + ${ROCKY_EXTRA_ARGS} openqa-cli api \ -X POST isos \ @@ -51,8 +53,8 @@ openqa-cli api \ DISTRI=rocky \ FLAVOR=package-set \ VERSION="$ROCKY_VERSION" \ - BUILD="$BUILD_PREFIX-packageset-$ROCKY_VERSION" \ - "${ROCKY_EXTRA_ARGS}" + BUILD="$BUILD_NAME" \ + ${ROCKY_EXTRA_ARGS} openqa-cli api \ -X POST isos \ @@ -61,8 +63,8 @@ openqa-cli api \ DISTRI=rocky \ FLAVOR=minimal-iso \ VERSION="$ROCKY_VERSION" \ - BUILD="$BUILD_PREFIX-minimal-$ROCKY_VERSION" \ - "${ROCKY_EXTRA_ARGS}" + BUILD="$BUILD_NAME" \ + ${ROCKY_EXTRA_ARGS} openqa-cli api \ -X POST isos \ @@ -71,5 +73,5 @@ openqa-cli api \ DISTRI=rocky \ FLAVOR=boot-iso \ VERSION="$ROCKY_VERSION" \ - BUILD="$BUILD_PREFIX-boot-$ROCKY_VERSION" \ - "${ROCKY_EXTRA_ARGS}" + BUILD="$BUILD_NAME" \ + ${ROCKY_EXTRA_ARGS} diff --git a/scripts/run-openqa-tests.sh b/scripts/run-openqa-tests.sh index 7f8fa91b..124977f3 100755 --- a/scripts/run-openqa-tests.sh +++ b/scripts/run-openqa-tests.sh @@ -1,9 +1,6 @@ #!/bin/bash set -e -MAJOR_VERSION=9 -MINOR_VERSION=0 - ## Usage: Post an ISO for the specified FLAVOR. Defaults to boot-iso. # ## Run the boot-iso FLAVOR @@ -15,13 +12,14 @@ MINOR_VERSION=0 ## 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_VERSION="9.2" + +MAJOR_VERSION=${ROCKY_VERSION:0:1} +MINOR_VERSION=${ROCKY_VERSION:2:1} ROCKY_FLAVOR="${ROCKY_FLAVOR:-boot-iso}" -ROCKY_VERSION="$MAJOR_VERSION.$MINOR_VERSION" ROCKY_ARCH="${ROCKY_ARCH:=x86_64}" ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}" -BUILD_PREFIX="-$(date +%Y%m%d.%H%M%S).0-$(git branch --show-current)" -BUILD_NAME="$BUILD_PREFIX-$ROCKY_FLAVOR-$ROCKY_VERSION" - +BUILD_NAME="-$(date +%Y%m%d).0-$(git branch --show-current)-$ROCKY_VERSION" ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH" if [[ "$ROCKY_FLAVOR" == "dvd-iso" || "$ROCKY_FLAVOR" == "universal" ]]; then