Merge pull request #58 from Conjur-Enterprise/fix-promote

jtuttle · GitHub Enterprise · commit d563d22bf1e3 · 2025-01-16T08:27:11.000-05:00
CNJR-0000: Fix git ownership issue in promote block
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -64,7 +64,7 @@ if (params.MODE == "PROMOTE") {
     dockerImageLocation = pwd() + "/docker-image*.tar*"
     infrapool.agentPut from: "${dockerImageLocation}", to: "${assetDirectory}"
     // Resolve ownership issue before promotion
-    infrapool.agentSh 'git config --global --add safe.directory ${PWD}'
+    sh 'git config --global --add safe.directory ${PWD}'
   }
 
   // Copy Github Enterprise release to Github

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ if (params.MODE == "PROMOTE") {`
`64`	`64`	`dockerImageLocation = pwd() + "/docker-image.tar"`
`65`	`65`	`infrapool.agentPut from: "${dockerImageLocation}", to: "${assetDirectory}"`
`66`	`66`	`// Resolve ownership issue before promotion`
`67`		`- infrapool.agentSh 'git config --global --add safe.directory ${PWD}'`
	`67`	`+ sh 'git config --global --add safe.directory ${PWD}'`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`// Copy Github Enterprise release to Github`