fixing token name for jenkins home directory replacement

robertpatrick · robertpatrick · commit b56ddf0c43cb · 2023-04-18T13:07:40.000-05:00
diff --git a/integration-tests/alias-test/Jenkinsfile.generate-child b/integration-tests/alias-test/Jenkinsfile.generate-child
@@ -57,7 +57,7 @@ pipeline {
                 withCredentials([file(credentialsId: "${oci_config_file_creds}", variable: 'OCI_CONFIG_FILE'),
                                  file(credentialsId: "${oci_signing_key_creds}", variable: 'OCI_SIGNING_KEY')]) {
                     sh "mkdir -p ${jenkins_home_directory}/.oci"
-                    sh "sed -e \"s:__jenkins_home_directory__:${jenkins_home_directory}:g\" \"\$OCI_CONFIG_FILE\" > ${jenkins_home_directory}/.oci/config"
+                    sh "sed -e \"s:__jenkins_home__:${jenkins_home_directory}:g\" \"\$OCI_CONFIG_FILE\" > ${jenkins_home_directory}/.oci/config"
                     sh "cp \"\$OCI_SIGNING_KEY\" ${jenkins_home_directory}/.oci/oci-signing-key.pem"
                 }
                 withMaven(globalMavenSettingsConfig: 'wkt-maven-settings-xml', publisherStrategy: 'EXPLICIT') {
diff --git a/integration-tests/alias-test/Jenkinsfile.verify-child b/integration-tests/alias-test/Jenkinsfile.verify-child
@@ -54,7 +54,7 @@ pipeline {
                 withCredentials([file(credentialsId: "${oci_config_file_creds}", variable: 'OCI_CONFIG_FILE'),
                                  file(credentialsId: "${oci_signing_key_creds}", variable: 'OCI_SIGNING_KEY')]) {
                     sh "mkdir -p ${jenkins_home_directory}/.oci"
-                    sh "sed -e \"s:__jenkins_home_directory__:${jenkins_home_directory}:g\" \"\$OCI_CONFIG_FILE\" > ${jenkins_home_directory}/.oci/config"
+                    sh "sed -e \"s:__jenkins_home__:${jenkins_home_directory}:g\" \"\$OCI_CONFIG_FILE\" > ${jenkins_home_directory}/.oci/config"
                     sh "cp \"\$OCI_SIGNING_KEY\" ${jenkins_home_directory}/.oci/oci-signing-key.pem"
                 }
                 withMaven(globalMavenSettingsConfig: 'wkt-maven-settings-xml', publisherStrategy: 'EXPLICIT') {

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ pipeline {`
`57`	`57`	`withCredentials([file(credentialsId: "${oci_config_file_creds}", variable: 'OCI_CONFIG_FILE'),`
`58`	`58`	`file(credentialsId: "${oci_signing_key_creds}", variable: 'OCI_SIGNING_KEY')]) {`
`59`	`59`	`sh "mkdir -p ${jenkins_home_directory}/.oci"`
`60`		`- sh "sed -e \"s:__jenkins_home_directory__:${jenkins_home_directory}:g\" \"\$OCI_CONFIG_FILE\" > ${jenkins_home_directory}/.oci/config"`
	`60`	`+ sh "sed -e \"s:__jenkins_home__:${jenkins_home_directory}:g\" \"\$OCI_CONFIG_FILE\" > ${jenkins_home_directory}/.oci/config"`
`61`	`61`	`sh "cp \"\$OCI_SIGNING_KEY\" ${jenkins_home_directory}/.oci/oci-signing-key.pem"`
`62`	`62`	`}`
`63`	`63`	`withMaven(globalMavenSettingsConfig: 'wkt-maven-settings-xml', publisherStrategy: 'EXPLICIT') {`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ pipeline {`
`54`	`54`	`withCredentials([file(credentialsId: "${oci_config_file_creds}", variable: 'OCI_CONFIG_FILE'),`
`55`	`55`	`file(credentialsId: "${oci_signing_key_creds}", variable: 'OCI_SIGNING_KEY')]) {`
`56`	`56`	`sh "mkdir -p ${jenkins_home_directory}/.oci"`
`57`		`- sh "sed -e \"s:__jenkins_home_directory__:${jenkins_home_directory}:g\" \"\$OCI_CONFIG_FILE\" > ${jenkins_home_directory}/.oci/config"`
	`57`	`+ sh "sed -e \"s:__jenkins_home__:${jenkins_home_directory}:g\" \"\$OCI_CONFIG_FILE\" > ${jenkins_home_directory}/.oci/config"`
`58`	`58`	`sh "cp \"\$OCI_SIGNING_KEY\" ${jenkins_home_directory}/.oci/oci-signing-key.pem"`
`59`	`59`	`}`
`60`	`60`	`withMaven(globalMavenSettingsConfig: 'wkt-maven-settings-xml', publisherStrategy: 'EXPLICIT') {`