Jenkins RT Refactor Updates

.cicd/Jenkinsfile

@@ -1,21 +1,37 @@
+ciRunningNode = []
 matchedNode = []
 generateBaselineNode = []
 for (label in pullRequest.labels) {
     listOfLabelNodeNames = jenkins.model.Jenkins.instance.nodes.collect {
         node -> node.getLabelString().contains(label) ? node.name : null
+
+        if (label.startsWith(node.getLabelString() + "-") && label.contains("CI_RUNNING")) {
+           ciRunningNode += node.getLabelString()
+        }
 
         if ((label.matches(node.getLabelString()+"-(.*)"))) {
-            matchedNode += node.getLabelString()
-        }
+           matchedNode += node.getLabelString()
+        }         
 
         if ((label.matches(node.getLabelString()+"(.*)-BL"))) {
             generateBaselineNode += node.getLabelString() 
         }
     }
 }
 
+matchedNode = matchedNode.unique()
+ciRunningNode = ciRunningNode.unique()
+matchedNode = matchedNode - ciRunningNode
+
 modifiedLabels = matchedNode.collect{"'" + it + "'"} 
 baselineLabels = generateBaselineNode.collect{"'" + it + "'"} 
+
+if (modifiedLabels.isEmpty()) {
+   echo "No new labels. Skipping build."
+   currentBuild.result = 'NOT_BUILT'
+   return // Exits the stage/script early
+}
+
 def generateStage(nodeLabel) {
     return {
         stage("Initialize on ${nodeLabel.replaceAll("'","")}") {
@@ -79,6 +95,7 @@ def generateStage(nodeLabel) {
 
                             echo "Testing concluded...removing labels for $machine from $GIT_URL"
                             echo "https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/{$machine-RT,$machine-BL}"
+                            curl --silent -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${GITHUB_TOKEN}"  https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/{$machine}-CI_RUNNING
                             curl --silent -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${GITHUB_TOKEN}"  https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/{$machine-RT,$machine-BL}
                         '''
                         currentBuild.result = 'FAILURE'
@@ -132,6 +149,7 @@ def generateStage(nodeLabel) {
 
 			    echo "Testing concluded...removing label ${label} for ${machine} from ${GIT_URL}"
 			    echo "https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/${machine}-${label}"
+			    curl --silent -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${GITHUB_TOKEN}"  https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/{$machine}-CI_RUNNING
 			    curl --silent -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${GITHUB_TOKEN}"  https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/{$machine-RT,$machine-BL}
 			'''
                 }

.cicd/scripts/regression_test.sh

@@ -105,12 +105,11 @@ function regression_test() {
 		    pwd
 		    cp "$(dirname "${WORKSPACE}")/RegressionTests_${machine_id}.log" "${WORKSPACE}/tests/logs/"
 		    cd "${WORKSPACE}/tests/"
-		elif [[ ${machine} =~ "Hera" ]]
+		elif [[ ${machine} =~ "Ursa" ]]
 		then
 		    echo "Running regression tests on ${machine}"
 		    export ACCNR=epic
-		    sed "s|QUEUE=batch|QUEUE=windfall|g" -i rt.sh
-		    local workflow="-r"
+		    local workflow="-e"
 		    ./rt.sh -a "${ACCNR}" "${workflow}" "${opt}" "${suite}" | tee "${WORKSPACE}/tests/logs/RT-run-${machine}.log"
 		    status=${PIPESTATUS[0]}
 		    cd logs/
@@ -126,6 +125,7 @@ function regression_test() {
 		then
 		    echo "Running regression tests on ${machine}"
 		    export ACCNR=nral0032
+		    local workflow="-e"
 		    ./rt.sh -a "${ACCNR}" "${workflow}" "${opt}" "${suite}" | tee "${WORKSPACE}/tests/logs/RT-run-${machine}.log"
 		    status=${PIPESTATUS[0]}
 		    cd logs/

.cicd/scripts/wm_init.sh

@@ -38,3 +38,12 @@ echo "machine_id=<${machine_id}>"
 	-o "${WORKSPACE:-$(pwd)}/${UFS_PLATFORM}-${UFS_COMPILER}-time-wm_init.json" \
 	-f '{\n  "cpu": "%P"\n, "memMax": "%M"\n, "mem": {"text": "%X", "data": "%D", "swaps": "%W", "context": "%c", "waits": "%w"}\n, "pagefaults": {"major": "%F", "minor": "%R"}\n, "filesystem": {"inputs": "%I", "outputs": "%O"}\n, "time": {"real": "%e", "user": "%U", "sys": "%S"}\n}' \
 	pwd
+
+GIT_OWNER=$(echo $GIT_URL | cut -d '/' -f4)
+GIT_REPO_NAME=$(echo $GIT_URL | cut -d '/' -f5 | cut -d '.' -f1)
+echo "$GIT_OWNER"
+echo "GIT_REPO_NAME"
+echo "$CHANGE_ID"
+
+echo "https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/${UFS_PLATFORM}-CI_RUNNING"
+curl --silent -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${GITHUB_TOKEN}"  https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels -d '{"labels":["'"$UFS_PLATFORM"'-CI_RUNNING"]}'