Fix the python tests and combine credentials

Signed-off-by: Zelin Hao <[email protected]>
opensearch-project · Jun 28, 2022 · 5129326 · 5129326
1 parent fd65413
commit 5129326
Show file tree

Hide file tree

Showing 11 changed files with 266 additions and 283 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
@@ -17,22 +17,21 @@
                   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.withCredentials([[GITHUB_USER, GITHUB_TOKEN]], groovy.lang.Closure)
-                     signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
-                     signArtifacts.withCredentials([configs], groovy.lang.Closure)
-                        signArtifacts.readJSON({text=configs})
-                        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
-                    export PROFILE_IDENTIFIER=null
-                    export PLATFORM_IDENTIFIER=null
-
-                    /tmp/workspace/sign.sh /tmp/workspace/archive --sigtype=.sig --platform=linux
-                )
+                  signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                  signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
+                     signArtifacts.readJSON({text=configs})
+                     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
+                   export PROFILE_IDENTIFIER=null
+                   export PLATFORM_IDENTIFIER=null
+
+                   /tmp/workspace/sign.sh /tmp/workspace/archive --sigtype=.sig --platform=linux
+               )
          release-data-prepper-all-artifacts.stage(Release Archives to Production Distribution Bucket, groovy.lang.Closure)
             release-data-prepper-all-artifacts.script(groovy.lang.Closure)
                release-data-prepper-all-artifacts.withAWS({role=production-role-name, roleAccount=aws-account-artifact, duration=900, roleSessionName=jenkins-session}, groovy.lang.Closure)
@@ -94,22 +93,21 @@
                   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.withCredentials([[GITHUB_USER, GITHUB_TOKEN]], groovy.lang.Closure)
-                     signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
-                     signArtifacts.withCredentials([configs], groovy.lang.Closure)
-                        signArtifacts.readJSON({text=configs})
-                        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
-                    export PROFILE_IDENTIFIER=null
-                    export PLATFORM_IDENTIFIER=null
-
-                    /tmp/workspace/sign.sh /tmp/workspace/maven --type=maven --platform=linux
-                )
+                  signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                  signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
+                     signArtifacts.readJSON({text=configs})
+                     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
+                   export PROFILE_IDENTIFIER=null
+                   export PLATFORM_IDENTIFIER=null
+
+                   /tmp/workspace/sign.sh /tmp/workspace/maven --type=maven --platform=linux
+               )
          release-data-prepper-all-artifacts.stage(Upload Artifacts to Sonatype, groovy.lang.Closure)
             release-data-prepper-all-artifacts.script(groovy.lang.Closure)
                release-data-prepper-all-artifacts.usernamePassword({credentialsId=Sonatype, usernameVariable=SONATYPE_USERNAME, passwordVariable=SONATYPE_PASSWORD})

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
@@ -16,22 +16,21 @@
                   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.withCredentials([[GITHUB_USER, GITHUB_TOKEN]], groovy.lang.Closure)
-                     signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
-                     signArtifacts.withCredentials([configs], groovy.lang.Closure)
-                        signArtifacts.readJSON({text=configs})
-                        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
-                    export PROFILE_IDENTIFIER=null
-                    export PLATFORM_IDENTIFIER=null
-
-                    /tmp/workspace/sign.sh /tmp/workspace/artifacts/distribution-build-opensearch/1.0.0/123/linux/x64/builds/opensearch/manifest.yml --type=maven --platform=linux
-                )
+                  signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                  signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
+                     signArtifacts.readJSON({text=configs})
+                     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
+                   export PROFILE_IDENTIFIER=null
+                   export PLATFORM_IDENTIFIER=null
+
+                   /tmp/workspace/sign.sh /tmp/workspace/artifacts/distribution-build-opensearch/1.0.0/123/linux/x64/builds/opensearch/manifest.yml --type=maven --platform=linux
+               )
          maven-sign-release.stage(stage maven artifacts, groovy.lang.Closure)
             maven-sign-release.script(groovy.lang.Closure)
                maven-sign-release.usernamePassword({credentialsId=Sonatype, usernameVariable=SONATYPE_USERNAME, passwordVariable=SONATYPE_PASSWORD})

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
@@ -14,22 +14,21 @@
                   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.withCredentials([[GITHUB_USER, GITHUB_TOKEN]], groovy.lang.Closure)
-                     signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
-                     signArtifacts.withCredentials([configs], groovy.lang.Closure)
-                        signArtifacts.readJSON({text=configs})
-                        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
-                    export PROFILE_IDENTIFIER=null
-                    export PLATFORM_IDENTIFIER=null
-
-                    /tmp/workspace/sign.sh /tmp/workspace/artifacts --sigtype=.sig --platform=linux
-                )
+                  signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                  signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
+                     signArtifacts.readJSON({text=configs})
+                     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
+                   export PROFILE_IDENTIFIER=null
+                   export PLATFORM_IDENTIFIER=null
+
+                   /tmp/workspace/sign.sh /tmp/workspace/artifacts --sigtype=.sig --platform=linux
+               )
                sign-standalone-artifacts.uploadToS3({sourcePath=/tmp/workspace/artifacts, bucket=dummy_bucket_name, path=sign_artifacts_job/dummy/upload/path/20/dist/signed})
                   uploadToS3.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC})
                   uploadToS3.withCredentials([AWS_ACCOUNT_PUBLIC], groovy.lang.Closure)

diff --git a/tests/jenkins/jobs/PromoteArtifactsQualifier_actions_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteArtifactsQualifier_actions_Jenkinsfile.txt
@@ -29,22 +29,21 @@
                      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.withCredentials([[GITHUB_USER, GITHUB_TOKEN]], groovy.lang.Closure)
-                        signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
-                        signArtifacts.withCredentials([configs], groovy.lang.Closure)
-                           signArtifacts.readJSON({text=configs})
-                           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
-                    export PROFILE_IDENTIFIER=null
-                    export PLATFORM_IDENTIFIER=null
-
-                    tests/jenkins/sign.sh tests/jenkins/tests/jenkins/file/found.zip --sigtype=.sig
-                )
+                     signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                     signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
+                        signArtifacts.readJSON({text=configs})
+                        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
+                   export PROFILE_IDENTIFIER=null
+                   export PLATFORM_IDENTIFIER=null
+
+                   tests/jenkins/sign.sh tests/jenkins/tests/jenkins/file/found.zip --sigtype=.sig
+               )
                   promoteArtifacts.withAWS({role=artifactPromotionRole, roleAccount=artifactsAccount, duration=900, roleSessionName=jenkins-session}, groovy.lang.Closure)
                      promoteArtifacts.s3Upload({bucket=prod-bucket-name, path=releases/core/opensearch/2.0.0-rc1/, workingDir=tests/jenkins/artifacts/tar/vars-build/2.0.0-rc1/33/linux/x64/tar/builds/opensearch/dist/, includePathPattern=**/opensearch-min-2.0.0-rc1-linux-x64*})
                      promoteArtifacts.s3Upload({bucket=prod-bucket-name, path=releases/bundle/opensearch/2.0.0-rc1/, workingDir=tests/jenkins/artifacts/tar/vars-build/2.0.0-rc1/33/linux/x64/tar/dist/opensearch/, includePathPattern=**/opensearch-2.0.0-rc1-linux-x64*})
@@ -65,21 +64,20 @@
                      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.withCredentials([[GITHUB_USER, GITHUB_TOKEN]], groovy.lang.Closure)
-                        signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
-                        signArtifacts.withCredentials([configs], groovy.lang.Closure)
-                           signArtifacts.readJSON({text=configs})
-                           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
-                    export PROFILE_IDENTIFIER=null
-                    export PLATFORM_IDENTIFIER=null
-
-                    tests/jenkins/sign.sh tests/jenkins/tests/jenkins/file/found.zip --sigtype=.sig
-                )
+                     signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                     signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
+                        signArtifacts.readJSON({text=configs})
+                        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
+                   export PROFILE_IDENTIFIER=null
+                   export PLATFORM_IDENTIFIER=null
+
+                   tests/jenkins/sign.sh tests/jenkins/tests/jenkins/file/found.zip --sigtype=.sig
+               )
                   promoteArtifacts.withAWS({role=artifactPromotionRole, roleAccount=artifactsAccount, duration=900, roleSessionName=jenkins-session}, groovy.lang.Closure)
                      promoteArtifacts.s3Upload({bucket=prod-bucket-name, path=releases/bundle/opensearch/2.0.0-rc1/, workingDir=tests/jenkins/artifacts/rpm/vars-build/2.0.0-rc1/33/linux/x64/rpm/dist/opensearch/, includePathPattern=**/opensearch-2.0.0-rc1-linux-x64*})