Merge branch 'develop' into base_update_cli

needles/anaconda/help/rocky-anaconda_help_keyboard_layout-20230504.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 89,
+      "ypos": 394,
+      "height": 22,
+      "width": 168
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_keyboard_layout"
+  ]
+}

needles/anaconda/help/rocky-anaconda_help_language_support-20230504.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "width": 195,
+      "height": 21,
+      "xpos": 70,
+      "ypos": 394,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_language_support"
+  ]
+}

needles/anaconda/help/rocky-anaconda_help_localization_link-20230504.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 20,
+      "ypos": 395,
+      "xpos": 92,
+      "width": 441
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_localization_link"
+  ]
+}

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"
+  ]
+}

needles/anaconda/help/rocky-anaconda_help_time_date-20230504.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 70,
+      "ypos": 573,
+      "height": 20,
+      "width": 225
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_time_date"
+  ]
+}

needles/anaconda/help/rocky-help_language_selection-20230504.json

@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "ypos": 217,
+      "xpos": 41,
+      "height": 38,
+      "width": 544
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_language_support",
+    "anaconda_help_language_selection"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

needles/cockpit/rocky-autoupdate_planned_time-20230517.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "ypos": 475,
+      "xpos": 529,
+      "width": 40,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "autoupdate_planned_time"
+  ]
+}

needles/cockpit/rocky-cockpit_autoupdate_planned_time-20230507.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "height": 21,
+      "width": 48,
+      "ypos": 475,
+      "xpos": 521,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "autoupdate_planned_time"
+  ]
+}

needles/cockpit/rocky-cockpit_logs-20230507.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 14,
+      "ypos": 362,
+      "height": 18,
+      "width": 39
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_logs"
+  ]
+}

needles/cockpit/rocky-cockpit_services_detail-20230507.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 27,
+      "type": "match",
+      "ypos": 15,
+      "height": 16,
+      "width": 64
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_services_detail"
+  ]
+}

needles/cockpit/rocky-cockpit_services_detail-20230517.json

@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "height": 28,
+      "type": "match",
+      "ypos": 585,
+      "xpos": 264,
+      "width": 133
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "ENV-LANGUAGE-english",
+    "cockpit_services_detail"
+  ]
+}

needles/cockpit/rocky-cockpit_updates_all_install-20230507.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 20,
+      "width": 64,
+      "height": 18,
+      "ypos": 713
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_updates_all_install"
+  ]
+}

needles/cockpit/rocky-logs-20230517.json

@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "ypos": 362,
+      "width": 39,
+      "xpos": 14,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "ENV-LANGUAGE-english",
+    "cockpit_logs"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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" \
+    BUILD="$BUILD_NAME" \
-    "${ROCKY_EXTRA_ARGS}"
+    ${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" \
+    BUILD="$BUILD_NAME" \
-    "${ROCKY_EXTRA_ARGS}"
+    ${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" \
+    BUILD="$BUILD_NAME" \
-    "${ROCKY_EXTRA_ARGS}"
+    ${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" \
+    BUILD="$BUILD_NAME" \
-    "${ROCKY_EXTRA_ARGS}"
+    ${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" \
+    BUILD="$BUILD_NAME" \
-    "${ROCKY_EXTRA_ARGS}"
+    ${ROCKY_EXTRA_ARGS}

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="-$(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"
 
 if [[ "$ROCKY_FLAVOR" == "dvd-iso" || "$ROCKY_FLAVOR" == "universal" ]]; then

tests/_boot_to_anaconda.pm

@@ -99,7 +99,7 @@ sub run {
                 # we direct the installer to virtio-console1, and use
                 # virtio-console as a root console
                 select_console('virtio-console1');
-                if (get_var("DISTRI") eq "rocky" && (get_version_major() > 8)) {
+                if (get_var("DISTRI") eq "rocky" && (get_version_major() >= 9)) {
                     unless (wait_serial "Use text mode", timeout => 120) { die "Anaconda has not started."; }
                     type_string "2\n";
                 }