Secondary test error code evaluated after Secondary Parallelizable are ran

srbarrios · srbarrios · commit aff4004eebc7 · 2020-03-16T11:11:57.000+01:00
diff --git a/jenkins_pipelines/manager_testsuite/Jenkinsfile_qa_sequential_testsuite b/jenkins_pipelines/manager_testsuite/Jenkinsfile_qa_sequential_testsuite
@@ -73,8 +73,11 @@ pipeline {
 
         stage('Secondary features') {
             steps {
-                sh "RAKE_NAMESPACE=cucumber RAKE_TASK=secondary TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env} ||:"
-                sh "RAKE_NAMESPACE=cucumber RAKE_TASK=secondary_parallelizable TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}"
+                script {
+                    def statusCode1 = sh script:"RAKE_NAMESPACE=cucumber RAKE_TASK=secondary TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}", returnStatus:true
+                    def statusCode2 = sh script:"RAKE_NAMESPACE=cucumber RAKE_TASK=secondary_parallelizable TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}", returnStatus:true
+                    sh "exit \$(( ${statusCode1}|${statusCode2} ))"
+                }
             }
         }
     }
diff --git a/jenkins_pipelines/manager_testsuite/Jenkinsfile_qa_testsuite b/jenkins_pipelines/manager_testsuite/Jenkinsfile_qa_testsuite
@@ -70,8 +70,11 @@ pipeline {
 
         stage('Secondary features') {
             steps {
-                sh "RAKE_NAMESPACE=cucumber RAKE_TASK=secondary TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env} ||:"
-                sh "RAKE_NAMESPACE=parallel RAKE_TASK=secondary_parallelizable TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}"
+                script {
+                    def statusCode1 = sh script:"RAKE_NAMESPACE=cucumber RAKE_TASK=secondary TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}", returnStatus:true
+                    def statusCode2 = sh script:"RAKE_NAMESPACE=cucumber RAKE_TASK=secondary_parallelizable TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}", returnStatus:true
+                    sh "exit \$(( ${statusCode1}|${statusCode2} ))"
+                }
             }
         }
     }
diff --git a/jenkins_pipelines/uyuni_testsuite/Jenkinsfile_qa_sequential_testsuite b/jenkins_pipelines/uyuni_testsuite/Jenkinsfile_qa_sequential_testsuite
@@ -71,8 +71,11 @@ pipeline {
 
         stage('Secondary features') {
             steps {
-                sh "RAKE_NAMESPACE=cucumber RAKE_TASK=secondary TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env} ||:"
-                sh "RAKE_NAMESPACE=cucumber RAKE_TASK=secondary_parallelizable TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}"
+                script {
+                    def statusCode1 = sh script:"RAKE_NAMESPACE=cucumber RAKE_TASK=secondary TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}", returnStatus:true
+                    def statusCode2 = sh script:"RAKE_NAMESPACE=cucumber RAKE_TASK=secondary_parallelizable TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}", returnStatus:true
+                    sh "exit \$(( ${statusCode1}|${statusCode2} ))"
+                }
             }
         }
     }
diff --git a/jenkins_pipelines/uyuni_testsuite/Jenkinsfile_qa_testsuite b/jenkins_pipelines/uyuni_testsuite/Jenkinsfile_qa_testsuite
@@ -68,8 +68,11 @@ pipeline {
         
         stage('Secondary features') {
             steps {
-                sh "RAKE_NAMESPACE=cucumber RAKE_TASK=secondary TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env} ||:"
-                sh "RAKE_NAMESPACE=parallel RAKE_TASK=secondary_parallelizable TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}"
+                script {
+                    def statusCode1 = sh script:"RAKE_NAMESPACE=cucumber RAKE_TASK=secondary TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}", returnStatus:true
+                    def statusCode2 = sh script:"RAKE_NAMESPACE=cucumber RAKE_TASK=secondary_parallelizable TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}", returnStatus:true
+                    sh "exit \$(( ${statusCode1}|${statusCode2} ))"
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,11 @@ pipeline {`
`73`	`73`
`74`	`74`	`stage('Secondary features') {`
`75`	`75`	`steps {`
`76`		`- sh "RAKE_NAMESPACE=cucumber RAKE_TASK=secondary TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env} \|\|:"`
`77`		`- sh "RAKE_NAMESPACE=cucumber RAKE_TASK=secondary_parallelizable TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}"`
	`76`	`+ script {`
	`77`	`+ def statusCode1 = sh script:"RAKE_NAMESPACE=cucumber RAKE_TASK=secondary TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}", returnStatus:true`
	`78`	`+ def statusCode2 = sh script:"RAKE_NAMESPACE=cucumber RAKE_TASK=secondary_parallelizable TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}", returnStatus:true`
	`79`	`+ sh "exit \$(( ${statusCode1}\|${statusCode2} ))"`
	`80`	`+ }`
`78`	`81`	`}`
`79`	`82`	`}`
`80`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,11 @@ pipeline {`
`70`	`70`
`71`	`71`	`stage('Secondary features') {`
`72`	`72`	`steps {`
`73`		`- sh "RAKE_NAMESPACE=cucumber RAKE_TASK=secondary TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env} \|\|:"`
`74`		`- sh "RAKE_NAMESPACE=parallel RAKE_TASK=secondary_parallelizable TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}"`
	`73`	`+ script {`
	`74`	`+ def statusCode1 = sh script:"RAKE_NAMESPACE=cucumber RAKE_TASK=secondary TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}", returnStatus:true`
	`75`	`+ def statusCode2 = sh script:"RAKE_NAMESPACE=cucumber RAKE_TASK=secondary_parallelizable TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}", returnStatus:true`
	`76`	`+ sh "exit \$(( ${statusCode1}\|${statusCode2} ))"`
	`77`	`+ }`
`75`	`78`	`}`
`76`	`79`	`}`
`77`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,11 @@ pipeline {`
`71`	`71`
`72`	`72`	`stage('Secondary features') {`
`73`	`73`	`steps {`
`74`		`- sh "RAKE_NAMESPACE=cucumber RAKE_TASK=secondary TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env} \|\|:"`
`75`		`- sh "RAKE_NAMESPACE=cucumber RAKE_TASK=secondary_parallelizable TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}"`
	`74`	`+ script {`
	`75`	`+ def statusCode1 = sh script:"RAKE_NAMESPACE=cucumber RAKE_TASK=secondary TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}", returnStatus:true`
	`76`	`+ def statusCode2 = sh script:"RAKE_NAMESPACE=cucumber RAKE_TASK=secondary_parallelizable TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}", returnStatus:true`
	`77`	`+ sh "exit \$(( ${statusCode1}\|${statusCode2} ))"`
	`78`	`+ }`
`76`	`79`	`}`
`77`	`80`	`}`
`78`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,11 @@ pipeline {`
`68`	`68`
`69`	`69`	`stage('Secondary features') {`
`70`	`70`	`steps {`
`71`		`- sh "RAKE_NAMESPACE=cucumber RAKE_TASK=secondary TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env} \|\|:"`
`72`		`- sh "RAKE_NAMESPACE=parallel RAKE_TASK=secondary_parallelizable TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}"`
	`71`	`+ script {`
	`72`	`+ def statusCode1 = sh script:"RAKE_NAMESPACE=cucumber RAKE_TASK=secondary TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}", returnStatus:true`
	`73`	`+ def statusCode2 = sh script:"RAKE_NAMESPACE=cucumber RAKE_TASK=secondary_parallelizable TERRAFORM=${params.terraform} TERRAFORM_PLUGINS=${params.terraform_plugins} bash jenkins-test-runner.sh ${params.sumaform_env}", returnStatus:true`
	`74`	`+ sh "exit \$(( ${statusCode1}\|${statusCode2} ))"`
	`75`	`+ }`
`73`	`76`	`}`
`74`	`77`	`}`
`75`	`78`	`}`