Adding upstream version 18.2.4.upstream/18.2.4upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 16 insertions, 3 deletions

diff --git a/qa/workunits/cephadm/test_dashboard_e2e.sh b/qa/workunits/cephadm/test_dashboard_e2e.sh
index 32e0bcc77..13746ec6d 100755
--- a/qa/workunits/cephadm/test_dashboard_e2e.sh
+++ b/qa/workunits/cephadm/test_dashboard_e2e.sh
@@ -20,6 +20,9 @@ install_common () {
         $SUDO apt-get update
         $SUDO apt-get install nodejs
     elif grep -q rhel /etc/*-release; then
+        if grep -q "CentOS Stream 9" /etc/*-release; then
+            NODEJS_VERSION="18"
+        fi
         $SUDO yum module -y enable nodejs:$NODEJS_VERSION
         $SUDO yum install -y jq npm
     else
diff --git a/qa/workunits/cephadm/test_iscsi_pids_limit.sh b/qa/workunits/cephadm/test_iscsi_pids_limit.sh
index bed4cc9e2..40bc60856 100755
--- a/qa/workunits/cephadm/test_iscsi_pids_limit.sh
+++ b/qa/workunits/cephadm/test_iscsi_pids_limit.sh
@@ -12,7 +12,17 @@ test ${CONT_COUNT} -eq 2
 
 for i in ${ISCSI_CONT_IDS}
 do
-  test $(sudo podman exec ${i} cat /sys/fs/cgroup/pids/pids.max) == max
+  # cgroups v1 and v2 have slightly different file locations for the pids.max
+  # so check both spots
+  if [ $(sudo podman exec ${i} cat /sys/fs/cgroup/pids/pids.max) ]; then
+    pid_limit=$(sudo podman exec ${i} cat /sys/fs/cgroup/pids/pids.max)
+  elif [ $(sudo podman exec ${i} cat /sys/fs/cgroup/pids.max) ]; then
+    pid_limit=$(sudo podman exec ${i} cat /sys/fs/cgroup/pids.max)
+  else
+    echo "could not find pids.max inside container"
+    exit 1
+  fi
+  test $pid_limit == max
 done
 
 for i in ${ISCSI_CONT_IDS}
diff --git a/qa/workunits/cephadm/test_repos.sh b/qa/workunits/cephadm/test_repos.sh
index 221585fd0..5c17e5106 100755
--- a/qa/workunits/cephadm/test_repos.sh
+++ b/qa/workunits/cephadm/test_repos.sh
@@ -30,7 +30,7 @@ function test_install_uninstall() {
 	      sudo zypper -n remove cephadm )
 }
 
-sudo $CEPHADM -v add-repo --release octopus
+sudo $CEPHADM -v add-repo --release quincy
 test_install_uninstall
 sudo $CEPHADM -v rm-repo
 
@@ -38,7 +38,7 @@ sudo $CEPHADM -v add-repo --dev main
 test_install_uninstall
 sudo $CEPHADM -v rm-repo
 
-sudo $CEPHADM -v add-repo --release 15.2.7
+sudo $CEPHADM -v add-repo --release 17.2.6
 test_install_uninstall
 sudo $CEPHADM -v rm-repo