# This is a combination of 11 commits.

parent 911a3a0 author pgodithi <[email protected]> 1658511150 -0400 committer pgodithi <[email protected]> 1658511189 -0400 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEuaPMeSek3p9IWNzDMSDf0RO9/aIFAmLa31UACgkQMSDf0RO9 /aJOHQ//ecjaTfftv4cMqqhOpTNwiwm0AbXyOp6w9zcuOgCaR3IVYfZGIdK6+UJ2 n0KZKP8+Aip0TzIXheDrrk3tF9+yCuoRCCFIlkdLkXAUhSu7t8zX5DcnTSnq/ahA d4lFLL5trB2IsCDKG5trTHO81uWtaf5UfcBmVmgsqWe2OsFPmBwMYgKM93he4VAN HrridkwHKB8DnXwJdGrEv97mFEwA1TJVDmmd70bB3XlXWsvECy94vtt3ly2f8AX6 5cwaSmqr6KotphTAipXWvj3R7jaorpn6N4AT3oh2LL9bQ4lBdZvY/kl96qYs6vAT ws+BUjihxxswOaKUjnLUdoiViwUCjKSiaPSb5T6mZuzCSegF5+9kuhkMBvChkWUG rgkq0bbmTnnBFZn+QhU2A03xg6CxZO44r6UxkX4yVU3CkPyKSFGRqgYEWWCfFCwh SwAv/TE3OLffHLoxUht8bMZ3qFcWFJpGv3dYN+vFMy8Fumf+t9sAhBXjJFkdrmqF 9zv27pO6KfZVCk2lg4T17BBZ4NKOGs0YJannvq/80Q32Sjl0mf/ChoTsnG7YzJxo 7O55nc4sXw/E+a/78RscWqUoUSXIa4D69RQxFS8x31FsXhSDpuDom9SkyDMIMFSD L16Yi+cSOLM0DBd7ajI5KegHjxrK1d16mIhwCekf7ykjR6zePME= =jOT6 -----END PGP SIGNATURE----- # This is a combination of 7 commits.tree 332d5b4df3eb6b64c9aeb1849ffd3f7ad420b46f parent 911a3a0 author pgodithi <[email protected]> 1658511150 -0400 committer pgodithi <[email protected]> 1658511150 -0400 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEuaPMeSek3p9IWNzDMSDf0RO9/aIFAmLa3y8ACgkQMSDf0RO9 /aLVShAAqF370BU0vihflbom1UwJZLsz/YI7G7hS+zIlkKdEeLMYAujr6x/AIdwf xxuqqiHo/B2M6BoIpDulYPAigpz6uMsBh/1oVPeKuJs8su6bPGbPmp7j8fojF00I mbJFlWbkQknpjhzPt4XCLsO9zl7urAzttOJeMCnYlyt8jWHkBvFMPxaEpqlhq4xA IRhL2PkeAOB+WktejCi8Gno2waVjcrQBCGoVtqH9vKwNTFC+JjHmGPcmuD2h2Uuj DVDqo7LA04wtfpcml6KbSBrhUolZyRsyVqiEWpihKe9gFLYQKJI+gr42yMYJohJO u3d5VfYQeLciLa350CRD/GfV7VGMgu+aJ7N9h0kwPm+hri8nSQM7atwrTgPA+wfL NXqbROTT8ETKNaoo1g2fdYS/oo9Tru705m4tr9h6WN8YMtEKPm5jD4DwxtLI8JbK T7a3hZ9jOyRAmdTpkYgPHVNWBtLhraUTRfzh/P86Pg2wBtoSTvw/ngDfLh5PVHcV +Rb3JcEqKNCJnHkEqmzPlXFlZzmrIY3/k5QwK6MozMrQ23fbdTE+NREFR0AZygYy APnzo8sYHz2idOla8VYeJumorIpSiAxLS64TTAc4y8wjdiRxUCbdxa8t14dIXUqp Ye3fvWwBNlW+y1IYVq1PN/NU9z/7s/UutuDw31pJ2GkqzfzyCRs= =QoHe -----END PGP SIGNATURE----- MacOS Signed-off-by: pgodithi <[email protected]> # This is the commit message opensearch-project#7: Add gradle cleanup before the checks (opensearch-project#2285) Signed-off-by: Peter Zhu <[email protected]> # This is the commit message opensearch-project#9: Update remaining env vars with credentials in jenkins libraries (opensearch-project#2286) * Update getManifestSHA lib env vars with credentials Signed-off-by: Sayali Gaikawad <[email protected]> # This is the commit message opensearch-project#11: Remove 2.1.0 from cron for building release candidates (opensearch-project#2287) Signed-off-by: Sayali Gaikawad <[email protected]>
prudhvigodithi · Jul 22, 2022 · 4034674 · 4034674
1 parent e6c8249
commit 4034674
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/tests/jenkins/jobs/PromoteYumRepos_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteYumRepos_Jenkinsfile.txt
@@ -44,11 +44,16 @@
 
     )
                      promoteYumRepos.signArtifacts({artifactPath=/tmp/workspace/artifacts/releases/bundle/opensearch/1.x/yum/repodata/repomd.pom, sigtype=.sig, platform=linux})
+<<<<<<< HEAD
                         signArtifacts.echo(PGP or Windows Signature Signing)
+=======
+                        signArtifacts.echo(PGP Signature Signing)
+>>>>>>> 071d6df (Update remaining env vars with credentials in jenkins libraries  (#2286))
                         signArtifacts.fileExists(/tmp/workspace/sign.sh)
                         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})
+<<<<<<< HEAD
                         signArtifacts.string({credentialsId=jenkins-signer-client-role, variable=SIGNER_CLIENT_ROLE})
                         signArtifacts.string({credentialsId=jenkins-signer-client-external-id, variable=SIGNER_CLIENT_EXTERNAL_ID})
                         signArtifacts.string({credentialsId=jenkins-signer-client-unsigned-bucket, variable=SIGNER_CLIENT_UNSIGNED_BUCKET})
@@ -64,6 +69,21 @@
 
                    /tmp/workspace/sign.sh /tmp/workspace/artifacts/releases/bundle/opensearch/1.x/yum/repodata/repomd.pom --sigtype=.sig --platform=linux
                )
+=======
+                        signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=signer_client_creds})
+                        signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], signer_client_creds], groovy.lang.Closure)
+                           signArtifacts.readJSON({text=signer_client_creds})
+                           signArtifacts.sh(
+                #!/bin/bash
+                set +x
+                export ROLE=dummy_role
+                export EXTERNAL_ID=dummy_ID
+                export UNSIGNED_BUCKET=dummy_unsigned_bucket
+                export SIGNED_BUCKET=dummy_signed_bucket
+
+                /tmp/workspace/sign.sh /tmp/workspace/artifacts/releases/bundle/opensearch/1.x/yum/repodata/repomd.pom --sigtype=.sig --platform=linux
+            )
+>>>>>>> 071d6df (Update remaining env vars with credentials in jenkins libraries  (#2286))
                      promoteYumRepos.sh(
             set -e
             set +x