Fix for RHELHA-1073

pipelines/libs/github/vars/getBuildInfo.groovy

@@ -58,9 +58,10 @@ def call(String project, Map info)
 	    is_draft = false
 	}
     } else {
+
 	info['target'] = env.BRANCH_NAME
 	info['pull_id'] = 1
-	info['publishrpm'] = 1
+	info['publishrpm'] = isThisAPublishBranch(info['target'])
 	info['install'] = isThisAnInstallBranch(info['target'])
 	if ("${info['install']}" == '1') {
 	    if ("${info['target']}" == 'main') {
@@ -71,7 +72,7 @@ def call(String project, Map info)
 		info['stableinstall'] = 1
 	    }
 	}
-	info['covinstall'] = 1
+	info['covinstall'] = isThisAPublishBranch(info['target'])
     }
     info['is_draft'] = is_draft
     info['covopts'] = getCovOpts(info['target'])

pipelines/libs/gitlab/vars/getBuildInfo.groovy

@@ -61,7 +61,7 @@ def call(String project, Map info)
 	info['target'] = env.BRANCH_NAME
 	info['source'] = env.BRANCH_NAME
 	info['pull_id'] = 1
-	info['publishrpm'] = 1
+	info['publishrpm'] = isThisAPublishBranch(info['target'])
 	info['install'] = isThisAnInstallBranch(info['target'])
 	if ("${info['install']}" == '1') {
 	    if ("${info['target']}" == 'main') {

pipelines/libs/global/vars/isThisAPublishBranch.groovy

@@ -0,0 +1,15 @@
+// Returns 1 if this branch and coverity scan results need to be published, 0 if not
+// Relies on project-specific function getPublishBranches()
+def call(String branch)
+{
+    def publish_branches = getPublishBranches()
+    if (publish_branches.contains(branch)) {
+	println("RPMs and Coverity scan results will be published for the branch ${branch}")
+	return 1
+    }
+    else {
+	println("RPMs and Coverity scan results will not be published for the branch ${branch}")
+	return 0
+    }
+
+}

pipelines/libs/global/vars/runStage.groovy

@@ -117,7 +117,7 @@ def doRunStage(String agentName, Map info, Map localinfo)
 		}
 
 		// Run all converted groovy stages first
-		for (stageinfo in stages) {
+		stages.each { stageinfo ->
 		    if (running) { // break does weird shit
 			stagestate['runstage'] = stageinfo.key
 
@@ -145,11 +145,12 @@ def doRunStage(String agentName, Map info, Map localinfo)
 		    }
 		}
 
+
 		// Convert localinfo map into shell variables
 		def exports = getShellVariables(localinfo)
 
 		// Run all the shell stages (will disappear)
-		for (stageinfo in shell_stages) {
+		shell_stages.each { stageinfo ->
 		    if (running) { // break does weird shit
 			stagestate['runstage'] = stageinfo.key
 

pipelines/projects/anvil/vars/getPublishBranches.groovy

@@ -0,0 +1,5 @@
+// Return list of branches, which will have their RPMs and Coverity scan results published 
+def call()
+{
+    return ['main', 'stable-3.1', 'stable-3.2']
+}

pipelines/projects/booth/vars/getPublishBranches.groovy

@@ -0,0 +1,5 @@
+// Return list of branches, which will have their RPMs and Coverity scan results published 
+def call()
+{
+    return ['main', 'stable-3.1', 'stable-3.2']
+}

pipelines/projects/corosync-qdevice/vars/getPublishBranches.groovy

@@ -0,0 +1,5 @@
+// Return list of branches, which will have their RPMs and Coverity scan results published 
+def call()
+{
+    return ['main']
+}

pipelines/projects/corosync/Jenkinsfile

@@ -15,7 +15,7 @@ pipeline {
     parameters {
 	string(name: 'bootstrap',   defaultValue: '0', description: 'Bootstrap the RPM repos')
 	string(name: 'fullrebuild', defaultValue: '0', description: 'This is a full rebuild - do not publish RPM and do NOT update build code on the nodes')
-    }
+	}
 
     stages {
 	// First check we are allowed to run, then set some params for that run

pipelines/projects/corosync/vars/getPublishBranches.groovy

@@ -0,0 +1,5 @@
+// Return list of branches, which will have their RPMs and Coverity scan results published 
+def call()
+{
+    return ['main', 'camelback']
+}

pipelines/projects/dlm/vars/getPublishBranches.groovy

@@ -0,0 +1,5 @@
+// Return list of branches, which will have their RPMs and Coverity scan results published 
+def call()
+{
+    return ['main']
+}

pipelines/projects/fence-agents/vars/getPublishBranches.groovy

@@ -0,0 +1,5 @@
+// Return list of branches to be installed
+def call()
+{
+    return ['main']
+}

pipelines/projects/gfs2-utils/Jenkinsfile

@@ -21,7 +21,7 @@ pipeline {
     parameters {
 	string(name: 'bootstrap',   defaultValue: '0', description: 'Bootstrap the RPM repos')
 	string(name: 'fullrebuild', defaultValue: '0', description: 'This is a full rebuild - do not publish RPM and do NOT update build code on the nodes')
-    }
+	}
 
     stages {
 	// First check we are allowed to run, then set some params for that run

pipelines/projects/gfs2-utils/vars/getPublishBranches.groovy

@@ -0,0 +1,5 @@
+// Return list of branches, which will have their RPMs and Coverity scan results published 
+def call()
+{
+    return ['main']
+}

pipelines/projects/kernel-ark/vars/getPublishBranches.groovy

@@ -0,0 +1,5 @@
+// Return list of branches, which will have their RPMs and Coverity scan results published 
+def call()
+{
+    return ['ark-latest', 'for-next', 'next']
+}

pipelines/projects/knet-ci-test-github/vars/getPublishBranches.groovy

@@ -0,0 +1,5 @@
+// Return list of branches, which will have their RPMs and Coverity scan results published 
+def call()
+{
+    return ['main']
+}

pipelines/projects/knet-ci-test-gitlab/vars/getPublishBranches.groovy

@@ -0,0 +1,5 @@
+// Return list of branches, which will have their RPMs and Coverity scan results published 
+def call()
+{
+    return ['main']
+}

pipelines/projects/kronosnet/Jenkinsfile

@@ -15,7 +15,7 @@ pipeline {
     parameters {
 	string(name: 'bootstrap',   defaultValue: '0', description: 'Bootstrap the RPM repos')
 	string(name: 'fullrebuild', defaultValue: '0', description: 'This is a full rebuild - do not publish RPM and do NOT update build code on the nodes')
-    }
+	}
 
     stages {
 	// First check we are allowed to run, then set some params for that run

pipelines/projects/kronosnet/vars/getPublishBranches.groovy

@@ -0,0 +1,5 @@
+// Return list of branches, which will have their RPMs and Coverity scan results published 
+def call()
+{
+    return ['main', 'stable1', 'stable1-proposed']
+}

pipelines/projects/kubesan/vars/getPublishBranches.groovy

@@ -0,0 +1,5 @@
+// Return list of branches, which will have their RPMs and Coverity scan results published 
+def call()
+{
+    return ['main']
+}

pipelines/projects/libqb/vars/getPublishBranches.groovy

@@ -0,0 +1,5 @@
+// Return list of branches, which will have their RPMs and Coverity scan results published 
+def call()
+{
+    return ['main']
+}

pipelines/projects/pacemaker/vars/getPublishBranches.groovy

@@ -0,0 +1,5 @@
+// Return list of branches, which will have their RPMs and Coverity scan results published 
+def call()
+{
+    return ['main', '3.0', '2.1']
+}

pipelines/projects/pcs/vars/getPublishBranches.groovy

@@ -0,0 +1,5 @@
+// Return list of branches, which will have their RPMs and Coverity scan results published 
+def call()
+{
+    return ['main', 'pcs-0.10', 'pcs-0.11']
+}

pipelines/projects/resource-agents/vars/getPublishBranches.groovy

@@ -0,0 +1,5 @@
+// Return list of branches, which will have their RPMs and Coverity scan results published 
+def call()
+{
+    return ['main']
+}

pipelines/projects/sbd/vars/getPublishBranches.groovy

@@ -0,0 +1,5 @@
+// Return list of branches, which will have their RPMs and Coverity scan results published 
+def call()
+{
+    return ['main']
+}