Merge pull request #199 from rocky-linux/develop

Merge develop to main

needles/anaconda/install_process/arabic/rocky-anaconda_install_weak_password-arabic-20231116.json

@@ -1,10 +1,10 @@
 {
   "area": [
     {
-      "width": 45,
+      "xpos": 650,
-      "height": 17,
+      "ypos": 743,
-      "xpos": 411,
+      "width": 335,
-      "ypos": 134,
+      "height": 18,
       "type": "match"
     }
   ],
@@ -12,6 +12,6 @@
   "tags": [
     "ENV-DISTRI-rocky",
     "LANGUAGE-arabic",
-    "anaconda_network_connected"
+    "anaconda_install_weak_password"
   ]
-}
+}

needles/anaconda/install_process/russian/rocky-anaconda_install_weak_password-russian-20231116.json

@@ -0,0 +1,24 @@
+{
+  "area": [
+    {
+      "height": 11,
+      "width": 36,
+      "type": "match",
+      "ypos": 145,
+      "xpos": 398
+    },
+    {
+      "xpos": 43,
+      "ypos": 746,
+      "width": 393,
+      "height": 11,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-russian",
+    "anaconda_install_weak_password"
+  ]
+}

needles/anaconda/network/arabic/rocky-anaconda_network_connected_arabic-20231117.json

@@ -0,0 +1,31 @@
+{
+  "area": [
+    {
+      "xpos": 91,
+      "ypos": 339,
+      "width": 175,
+      "height": 21,
+      "type": "match"
+    },
+    {
+      "xpos": 265,
+      "ypos": 339,
+      "width": 43,
+      "height": 35,
+      "type": "match"
+    },
+    {
+      "xpos": 91,
+      "ypos": 360,
+      "width": 53,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-arabic",
+    "anaconda_network_connected"
+  ]
+}

needles/anaconda/network/french/rocky-anaconda_network_connected_french-20210822.json

@@ -1,17 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "ypos": 133,
-      "height": 17,
-      "xpos": 568,
-      "width": 66
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "LANGUAGE-french",
-    "anaconda_network_connected"
-  ]
-}

needles/anaconda/network/french/rocky-anaconda_network_connected_french-20231117.json

@@ -0,0 +1,24 @@
+{
+  "area": [
+    {
+      "xpos": 737,
+      "ypos": 341,
+      "width": 125,
+      "height": 35,
+      "type": "match"
+    },
+    {
+      "xpos": 782,
+      "ypos": 379,
+      "width": 51,
+      "height": 15,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-french",
+    "anaconda_network_connected"
+  ]
+}

needles/anaconda/network/japanese/rocky-anaconda_network_connected_japanese-20231117.json

@@ -1,17 +1,17 @@
-{
+{
-  "area": [
+  "area": [
-    {
+    {
-      "width": 89,
+      "xpos": 737,
-      "height": 22,
+      "ypos": 335,
-      "xpos": 588,
+      "width": 71,
-      "ypos": 136,
+      "height": 44,
-      "type": "match"
+      "type": "match"
-    }
+    }
-  ],
+  ],
-  "properties": [],
+  "properties": [],
-  "tags": [
+  "tags": [
-    "ENV-DISTRI-rocky",
+    "ENV-DISTRI-rocky",
-    "LANGUAGE-japanese",
+    "LANGUAGE-japanese",
-    "anaconda_network_connected"
+    "anaconda_network_connected"
-  ]
+  ]
-}
+}

needles/anaconda/network/russian/rocky-anaconda_network_connected_russian-20231117.json

@@ -1,17 +1,17 @@
-{
+{
-  "area": [
+  "area": [
-    {
+    {
-      "xpos": 604,
+      "xpos": 733,
-      "height": 17,
+      "ypos": 340,
-      "width": 84,
+      "width": 83,
-      "type": "match",
+      "height": 37,
-      "ypos": 133
+      "type": "match"
-    }
+    }
-  ],
+  ],
-  "properties": [],
+  "properties": [],
-  "tags": [
+  "tags": [
-    "ENV-DISTRI-rocky",
+    "ENV-DISTRI-rocky",
-    "LANGUAGE-russian",
+    "LANGUAGE-russian",
-    "anaconda_network_connected"
+    "anaconda_network_connected"
-  ]
+  ]
-}
+}

tests/_do_install_and_reboot.pm

@@ -65,6 +65,9 @@ sub _do_root_and_user {
     # Check username (and hence keyboard layout) if non-English
     if (get_var('LANGUAGE')) {
         assert_screen "anaconda_install_user_created";
+        if (check_screen "anaconda_install_weak_password") {
+            assert_and_click "anaconda_spoke_done";
+        }
     }
 }
 

tests/slurm.pm

@@ -9,17 +9,17 @@ sub slurm_setup {
     assert_script_run "dnf -y install rocky-release-hpc", 120;
 
     # Set up munge
-    assert_script_run "dnf -y install munge", 120;
+    assert_script_run 'dnf -y install munge --releasever=' . get_version_major, 120;
     assert_script_run "dd if=/dev/urandom bs=1 count=1024 >/etc/munge/munge.key";
     assert_script_run "chmod 400 /etc/munge/munge.key";
     assert_script_run "chown munge.munge /etc/munge/munge.key";
     assert_script_run "systemctl enable --now munge.service";
 
     # install slurm
-    if (get_var("CURRREL") eq '8') {
+    if (get_version_major() eq '8') {
         assert_script_run "dnf config-manager --set-enabled powertools";
     }
-    assert_script_run "dnf install -y slurm$version-slurmdbd slurm$version-slurmrestd slurm$version-slurmctld slurm$version-slurmd";
+    assert_script_run "dnf install -y slurm$version-slurmdbd slurm$version-slurmrestd slurm$version-slurmctld slurm$version-slurmd  --releasever=" . get_version_major;
 
     # Since this is a single node system, we don't have to modify the conf files. We will for larger multi-node tests.
     # start services