Merge pull request #52 from opendevstack/fix/tag-image-in-cd-project

Update Jenkinsfile

Author: Michael Sauter

Jenkinsfile

@@ -11,17 +11,14 @@ library("ods-jenkins-shared-library@${odsGitRef}")
 
 odsComponentPipeline(
   imageStreamTag: "${odsNamespace}/jenkins-agent-maven:${odsImageTag}",
-  branchToEnvironmentMapping: [
-    '*' : 'dev',
-    "${odsGitRef}" : 'test'
-  ],
+  branchToEnvironmentMapping: [:],
   debug: true,
   resourceRequestMemory: '3Gi',
   resourceLimitMemory: '3Gi'
 ) { context ->
   stageBuild(context)
   odsComponentStageScanWithSonar(context, [branch: '*'])
-  odsComponentStageBuildOpenShiftImage(context)
+  odsComponentStageBuildOpenShiftImage(context, [branch: '*'])
   stageCreatedImageTagLatest(context)
 }
 
@@ -67,7 +64,7 @@ def stageCreatedImageTagLatest(def context) {
 	stage('Tag created image') {
 		def targetImageTag = context.gitBranch.replace('/','_').replace('-','_')
 		sh(
-			script: "oc -n ${context.targetProject} tag ${context.componentId}:${context.shortGitCommit} ${context.componentId}:${targetImageTag}",
+			script: "oc -n ${context.cdProject} tag ${context.componentId}:${context.shortGitCommit} ${context.componentId}:${targetImageTag}",
 			label: "Set tag '${targetImageTag}' on is/${context.componentId}"
 		)
 	}