MLE-20695 Fix Bug caused by ubi9 missing grep dependency (#304)

* MLE-20695: Fix missing dependency grep for UBI9

* update Jenkinsfile to support UBI9 image type

---------

Co-authored-by: Peng Zhou <[email protected]>

Author: pengzhouml

Jenkinsfile

@@ -179,7 +179,7 @@ pipeline {
     }
 
     parameters {
-        choice(name: 'dockerImageType', choices: 'ubi-rootless\nubi', description: 'Platform type for Docker image')
+        choice(name: 'dockerImageType', choices: 'ubi-rootless\nubi\nubi9-rootless\nubi9', description: 'Platform type for Docker image')
         string(name: 'dockerVersion', defaultValue: 'latest-11', description: 'Docker tag to use for tests. (e.g. 11.2.nightly-ubi-rootless-1.1.2) Has to correspond with dockerImageType.', trim: true)
         string(name: 'prevDockerVersion', defaultValue: 'latest-10', description: 'Previous Docker version for MarkLogic upgrade tests. (e.g. 10.0-10.2-centos-1.1.2) Has to correspond with dockerImageType.', trim: true)
         choice(name: 'K8_VERSION', choices: 'v1.31.7\nv1.32.3\nv1.30.11\nv1.29.15\nv1.28.15\nv1.27.16\nv1.26.15\nv1.25.16', description: 'Test Kubernetes version.')

charts/templates/configmap-scripts.yaml

@@ -10,7 +10,7 @@ metadata:
 data:
   liveness-probe.sh: |
     #!/bin/bash
-    pid=$(pgrep start.marklogic)
+    pid=$(ps aux | grep "/bin/bash /usr/local/bin/start-marklogic.sh" | grep -v grep | awk '{print $2}')
     log () {
       local TIMESTAMP=$(date +"%Y-%m-%d %T.%3N")
       # Check to make sure pod doesn't terminate if PID value is empty for any reason
@@ -20,8 +20,12 @@ data:
     }
 
     # Check if ML service is running. Exit with 1 if it is other than running
-    ml_status=$(/etc/init.d/MarkLogic status)
-
+    if [ -e /etc/init.d/MarkLogic ]; then
+        ml_status=$(/etc/init.d/MarkLogic status)
+    else
+        ml_status=$(/etc/MarkLogic/MarkLogic-service.sh status)
+    fi
+    
     if [[ "$ml_status" =~ "running" ]]; then
         http_code=$(curl -o /tmp/probe_response.txt -s -w "%{http_code}" "http://${HOSTNAME}:8001/admin/v1/timestamp")
         curl_code=$?
@@ -114,7 +118,7 @@ data:
     MARKLOGIC_ADMIN_USERNAME="$(< /run/secrets/ml-secrets/username)"
     MARKLOGIC_ADMIN_PASSWORD="$(< /run/secrets/ml-secrets/password)"
 
-    pid=$(pgrep start.marklogic)
+    pid=$(ps aux | grep "/bin/bash /usr/local/bin/start-marklogic.sh" | grep -v grep | awk '{print $2}')
 
     log () {
         local TIMESTAMP=$(date +"%Y-%m-%d %T.%3N")
@@ -191,7 +195,7 @@ data:
         echo "IS_BOOTSTRAP_HOST false"
     fi
 
-    pid=$(pgrep start.marklogic)
+    pid=$(ps aux | grep "/bin/bash /usr/local/bin/start-marklogic.sh" | grep -v grep | awk '{print $2}')
 
     ###############################################################
     # Logging utility
@@ -891,7 +895,7 @@ data:
       fi
     }
     
-    pid=$(pgrep start.marklogic)
+    pid=$(ps aux | grep "/bin/bash /usr/local/bin/start-marklogic.sh" | grep -v grep | awk '{print $2}')
 
     log "Info: [root-rootless-upgrade] Execution Start"