ST-3402: Refactored Jenkinsfile to get secrets from Vault instead of Jenkins credential store

elismaga · elismaga · commit 7aeac7bbf13e · 2020-06-22T11:21:51.000-07:00
diff --git a/tests/system/Jenkinsfile b/tests/system/Jenkinsfile
@@ -8,21 +8,23 @@ def config = jobConfig {
 }
 
 def job = {
-    withCredentials([
-        file(credentialsId: 'muckrake-2017-06-01.pem', variable: 'MUCKRAKE_PEM')]) {
-        sshagent(['ConfluentJenkins Github SSH Key']) {
-            configFileProvider([configFile(fileId: 'jenkins-maven-global-settings',
-                                targetLocation: '/home/jenkins/.m2/settings.xml')]) {
-                stage("Run tests") {
-                    sh 'tests/system/run-tests.sh'
-                }
+    configureGitSSH("github/confluent_jenkins", "private_key")
+    withVaultEnv([["artifactory/tools_jenkins", "user", "TOOLS_ARTIFACTORY_USER"],
+        ["artifactory/tools_jenkins", "password", "TOOLS_ARTIFACTORY_PASSWORD"],
+        ["sonatype/confluent", "user", "SONATYPE_OSSRH_USER"],
+        ["sonatype/confluent", "password", "SONATYPE_OSSRH_PASSWORD"]]) {
+        withVaultFile([["maven/jenkins_maven_global_settings", "settings_xml",
+            "/home/jenkins/.m2/settings.xml", "MAVEN_GLOBAL_SETTINGS"],
+            ["muckrake/2017-06-01", "pem", "muckrake-2017-06-01.pem", "MUCKRAKE_PEM"]]) {
+            stage("Run tests") {
+                sh 'tests/system/run-tests.sh'
             }
         }
     }
 }
 
 def post = {
-    withCredentials([file(credentialsId: 'muckrake-2017-06-01.pem', variable: 'MUCKRAKE_PEM')]) {
+    withVaultFile([["muckrake/2017-06-01", "pem", "muckrake-2017-06-01.pem", "MUCKRAKE_PEM"]]) {
         stage('Cleanup tests') {
             sh 'tests/system/cleanup-tests.sh'
         }

Original file line number	Diff line number	Diff line change
`@@ -8,21 +8,23 @@ def config = jobConfig {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`def job = {`
`11`		`- withCredentials([`
`12`		`- file(credentialsId: 'muckrake-2017-06-01.pem', variable: 'MUCKRAKE_PEM')]) {`
`13`		`- sshagent(['ConfluentJenkins Github SSH Key']) {`
`14`		`- configFileProvider([configFile(fileId: 'jenkins-maven-global-settings',`
`15`		`- targetLocation: '/home/jenkins/.m2/settings.xml')]) {`
`16`		`- stage("Run tests") {`
`17`		`- sh 'tests/system/run-tests.sh'`
`18`		`- }`
	`11`	`+ configureGitSSH("github/confluent_jenkins", "private_key")`
	`12`	`+ withVaultEnv([["artifactory/tools_jenkins", "user", "TOOLS_ARTIFACTORY_USER"],`
	`13`	`+ ["artifactory/tools_jenkins", "password", "TOOLS_ARTIFACTORY_PASSWORD"],`
	`14`	`+ ["sonatype/confluent", "user", "SONATYPE_OSSRH_USER"],`
	`15`	`+ ["sonatype/confluent", "password", "SONATYPE_OSSRH_PASSWORD"]]) {`
	`16`	`+ withVaultFile([["maven/jenkins_maven_global_settings", "settings_xml",`
	`17`	`+ "/home/jenkins/.m2/settings.xml", "MAVEN_GLOBAL_SETTINGS"],`
	`18`	`+ ["muckrake/2017-06-01", "pem", "muckrake-2017-06-01.pem", "MUCKRAKE_PEM"]]) {`
	`19`	`+ stage("Run tests") {`
	`20`	`+ sh 'tests/system/run-tests.sh'`
`19`	`21`	`}`
`20`	`22`	`}`
`21`	`23`	`}`
`22`	`24`	`}`
`23`	`25`
`24`	`26`	`def post = {`
`25`		`- withCredentials([file(credentialsId: 'muckrake-2017-06-01.pem', variable: 'MUCKRAKE_PEM')]) {`
	`27`	`+ withVaultFile([["muckrake/2017-06-01", "pem", "muckrake-2017-06-01.pem", "MUCKRAKE_PEM"]]) {`
`26`	`28`	`stage('Cleanup tests') {`
`27`	`29`	`sh 'tests/system/cleanup-tests.sh'`
`28`	`30`	`}`