Add jenkins prefix to signer credentials (#2342)

* Add jenkins prefix to signer credentials Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>
opensearch-project · Jul 15, 2022 · 932dbb4 · 932dbb4
1 parent cc74123
commit 932dbb4
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/...nkinsjob-regression-files/data-prepper/release-data-prepper-all-artifacts.jenkinsfile.txt b/...nkinsjob-regression-files/data-prepper/release-data-prepper-all-artifacts.jenkinsfile.txt
@@ -22,7 +22,7 @@
                   signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                   signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                   signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
-                  signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                  signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=configs})
                   signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
                      signArtifacts.readJSON({text=configs})
                      signArtifacts.sh(
@@ -98,7 +98,7 @@
                   signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                   signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                   signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
-                  signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                  signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=configs})
                   signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
                      signArtifacts.readJSON({text=configs})
                      signArtifacts.sh(

diff --git a/...jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt b/...jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt
@@ -19,7 +19,7 @@
                   signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                   signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                   signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
-                  signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                  signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=configs})
                   signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
                      signArtifacts.readJSON({text=configs})
                      signArtifacts.sh(

diff --git a/...sjob-regression-files/sign-standalone-artifacts/sign-standalone-artifacts.jenkinsfile.txt b/...sjob-regression-files/sign-standalone-artifacts/sign-standalone-artifacts.jenkinsfile.txt
@@ -15,7 +15,7 @@
                   signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                   signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                   signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
-                  signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                  signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=configs})
                   signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
                      signArtifacts.readJSON({text=configs})
                      signArtifacts.sh(

diff --git a/tests/jenkins/jobs/PromoteArtifactsQualifier_actions_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteArtifactsQualifier_actions_Jenkinsfile.txt
@@ -38,7 +38,7 @@
                         signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                         signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                         signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
-                        signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                        signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=configs})
                         signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
                            signArtifacts.readJSON({text=configs})
                            signArtifacts.sh(
@@ -76,7 +76,7 @@
                         signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                         signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                         signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
-                        signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                        signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=configs})
                         signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
                            signArtifacts.readJSON({text=configs})
                            signArtifacts.sh(

diff --git a/tests/jenkins/jobs/PromoteArtifactsQualifier_actions_OpenSearch_Dashboards_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteArtifactsQualifier_actions_OpenSearch_Dashboards_Jenkinsfile.txt
@@ -38,7 +38,7 @@
                         signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                         signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                         signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
-                        signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                        signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=configs})
                         signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
                            signArtifacts.readJSON({text=configs})
                            signArtifacts.sh(
@@ -76,7 +76,7 @@
                         signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                         signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                         signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
-                        signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                        signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=configs})
                         signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
                            signArtifacts.readJSON({text=configs})
                            signArtifacts.sh(

diff --git a/tests/jenkins/jobs/PromoteArtifacts_actions_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteArtifacts_actions_Jenkinsfile.txt
@@ -41,7 +41,7 @@
                         signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                         signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                         signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
-                        signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                        signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=configs})
                         signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
                            signArtifacts.readJSON({text=configs})
                            signArtifacts.sh(
@@ -70,7 +70,7 @@
                         signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                         signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                         signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
-                        signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                        signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=configs})
                         signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
                            signArtifacts.readJSON({text=configs})
                            signArtifacts.sh(
@@ -128,7 +128,7 @@
                         signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                         signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                         signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
-                        signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                        signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=configs})
                         signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
                            signArtifacts.readJSON({text=configs})
                            signArtifacts.sh(

diff --git a/tests/jenkins/jobs/PromoteArtifacts_actions_OpenSearch_Dashboards_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteArtifacts_actions_OpenSearch_Dashboards_Jenkinsfile.txt
@@ -38,7 +38,7 @@
                         signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                         signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                         signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
-                        signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                        signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=configs})
                         signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
                            signArtifacts.readJSON({text=configs})
                            signArtifacts.sh(
@@ -76,7 +76,7 @@
                         signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                         signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                         signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
-                        signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                        signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=configs})
                         signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
                            signArtifacts.readJSON({text=configs})
                            signArtifacts.sh(

diff --git a/tests/jenkins/jobs/PromoteYumRepos_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteYumRepos_Jenkinsfile.txt
@@ -49,7 +49,7 @@
                         signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                         signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                         signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
-                        signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                        signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=configs})
                         signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
                            signArtifacts.readJSON({text=configs})
                            signArtifacts.sh(

diff --git a/tests/jenkins/jobs/SignArtifacts_Jenkinsfile.txt b/tests/jenkins/jobs/SignArtifacts_Jenkinsfile.txt
@@ -9,7 +9,7 @@
                   signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                   signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                   signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
-                  signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                  signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=configs})
                   signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
                      signArtifacts.readJSON({text=configs})
                      signArtifacts.sh(
@@ -108,7 +108,7 @@
                   signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                   signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                   signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
-                  signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                  signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=configs})
                   signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
                      signArtifacts.readJSON({text=configs})
                      signArtifacts.sh(

diff --git a/vars/signArtifacts.groovy b/vars/signArtifacts.groovy
@@ -111,7 +111,7 @@ void call(Map args = [:]) {
         String arguments = generateArguments(args)
 
         // Sign artifacts
-        def configSecret = args.platform == "windows" ? "signer-windows-config" : "signer-pgp-config"
+        def configSecret = args.platform == "windows" ? "jenkins-signer-windows-config" : "jenkins-signer-client-creds"
         withCredentials([usernamePassword(credentialsId: "${GITHUB_BOT_TOKEN_NAME}", usernameVariable: 'GITHUB_USER', passwordVariable: 'GITHUB_TOKEN'),
                         string(credentialsId: configSecret, variable: 'configs')]) {
             def creds = readJSON(text: configs)