Merge remote-tracking branch 'upstream/1.x' into 1.x

peterzhuamazon · Nov 5, 2022 · 5398941 · 5398941
2 parents e39e217 + 9db6880
commit 5398941
Show file tree

Hide file tree

Showing 64 changed files with 84 additions and 84 deletions.
diff --git a/tests/jenkins/jobs/ArchiveAssembleUpload_Jenkinsfile.txt b/tests/jenkins/jobs/ArchiveAssembleUpload_Jenkinsfile.txt
@@ -5,7 +5,7 @@
             ArchiveAssembleUpload_Jenkinsfile.script(groovy.lang.Closure)
                ArchiveAssembleUpload_Jenkinsfile.archiveAssembleUpload({inputManifest=tests/data/opensearch-1.3.0.yml, platform=linux, architecture=x64, distribution=tar, stashName=test-stash-tar})
                   archiveAssembleUpload.legacySCM(groovy.lang.Closure)
-                  archiveAssembleUpload.library({identifier=jenkins@1.0.4, retriever=null})
+                  archiveAssembleUpload.library({identifier=jenkins@1.1.1, retriever=null})
                   archiveAssembleUpload.readYaml({file=tests/data/opensearch-1.3.0.yml})
                   InputManifest.asBoolean()
                   archiveAssembleUpload.echo(Unstashing test-stash-tar before starting the assemble process)
@@ -15,17 +15,17 @@
                   BuildManifest.asBoolean()
                   archiveAssembleUpload.assembleUpload({inputManifest=tests/data/opensearch-1.3.0.yml, platform=linux, architecture=x64, distribution=tar, stashName=test-stash-tar, buildManifest=tar/builds/opensearch/manifest.yml})
                      assembleUpload.legacySCM(groovy.lang.Closure)
-                     assembleUpload.library({identifier=jenkins@1.0.4, retriever=null})
+                     assembleUpload.library({identifier=jenkins@1.1.1, retriever=null})
                      assembleUpload.assembleManifest({inputManifest=tests/data/opensearch-1.3.0.yml, platform=linux, architecture=x64, distribution=tar, stashName=test-stash-tar, buildManifest=tar/builds/opensearch/manifest.yml})
                         assembleManifest.legacySCM(groovy.lang.Closure)
-                        assembleManifest.library({identifier=jenkins@1.0.4, retriever=null})
+                        assembleManifest.library({identifier=jenkins@1.1.1, retriever=null})
                         assembleManifest.readYaml({file=tar/builds/opensearch/manifest.yml})
                         BuildManifest.asBoolean()
                         BuildManifest.getArtifactRootUrlWithoutDistribution(https://ci.opensearch.org/dbc, vars-build, 33)
                         assembleManifest.sh(./assemble.sh "tar/builds/opensearch/manifest.yml" --base-url https://ci.opensearch.org/dbc/vars-build/1.3.0/33/linux/x64)
                      assembleUpload.uploadArtifacts({inputManifest=tests/data/opensearch-1.3.0.yml, platform=linux, architecture=x64, distribution=tar, stashName=test-stash-tar, buildManifest=tar/builds/opensearch/manifest.yml})
                         uploadArtifacts.legacySCM(groovy.lang.Closure)
-                        uploadArtifacts.library({identifier=jenkins@1.0.4, retriever=null})
+                        uploadArtifacts.library({identifier=jenkins@1.1.1, retriever=null})
                         uploadArtifacts.readYaml({file=tar/builds/opensearch/manifest.yml})
                         BuildManifest.asBoolean()
                         BuildManifest.getMinArtifact()

diff --git a/tests/jenkins/jobs/AssembleManifest_rpm_Jenkinsfile.txt b/tests/jenkins/jobs/AssembleManifest_rpm_Jenkinsfile.txt
@@ -5,7 +5,7 @@
             AssembleManifest_rpm_Jenkinsfile.script(groovy.lang.Closure)
                AssembleManifest_rpm_Jenkinsfile.assembleManifest({buildManifest=tests/data/opensearch-build-1.3.0-rpm.yml})
                   assembleManifest.legacySCM(groovy.lang.Closure)
-                  assembleManifest.library({identifier=jenkins@1.0.4, retriever=null})
+                  assembleManifest.library({identifier=jenkins@1.1.1, retriever=null})
                   assembleManifest.readYaml({file=tests/data/opensearch-build-1.3.0-rpm.yml})
                   BuildManifest.asBoolean()
                   BuildManifest.getArtifactRootUrlWithoutDistribution(https://ci.opensearch.org/dbc, vars-build, 123)
@@ -92,7 +92,7 @@
                     )
                   assembleManifest.buildYumRepo({baseUrl=https://ci.opensearch.org/dbc/vars-build/1.3.0/123/linux/x64, buildManifest=tests/data/opensearch-build-1.3.0-rpm.yml})
                      buildYumRepo.legacySCM(groovy.lang.Closure)
-                     buildYumRepo.library({identifier=jenkins@1.0.4, retriever=null})
+                     buildYumRepo.library({identifier=jenkins@1.1.1, retriever=null})
                      buildYumRepo.readYaml({file=tests/data/opensearch-build-1.3.0-rpm.yml})
                      BuildManifest.asBoolean()
                      buildYumRepo.echo(Create yum repo metadata and repo file tests/data/opensearch-build-1.3.0-rpm.yml)

diff --git a/tests/jenkins/jobs/AssembleManifest_tar_Jenkinsfile.txt b/tests/jenkins/jobs/AssembleManifest_tar_Jenkinsfile.txt
@@ -5,7 +5,7 @@
             AssembleManifest_tar_Jenkinsfile.script(groovy.lang.Closure)
                AssembleManifest_tar_Jenkinsfile.assembleManifest({buildManifest=tests/data/opensearch-build-1.3.0.yml})
                   assembleManifest.legacySCM(groovy.lang.Closure)
-                  assembleManifest.library({identifier=jenkins@1.0.4, retriever=null})
+                  assembleManifest.library({identifier=jenkins@1.1.1, retriever=null})
                   assembleManifest.readYaml({file=tests/data/opensearch-build-1.3.0.yml})
                   BuildManifest.asBoolean()
                   BuildManifest.getArtifactRootUrlWithoutDistribution(https://ci.opensearch.org/dbc, vars-build, 123)

diff --git a/tests/jenkins/jobs/AssembleUpload_Jenkinsfile.txt b/tests/jenkins/jobs/AssembleUpload_Jenkinsfile.txt
@@ -5,17 +5,17 @@
             AssembleUpload_Jenkinsfile.script(groovy.lang.Closure)
                AssembleUpload_Jenkinsfile.assembleUpload({buildManifest=tests/data/opensearch-build-1.1.0.yml})
                   assembleUpload.legacySCM(groovy.lang.Closure)
-                  assembleUpload.library({identifier=jenkins@1.0.4, retriever=null})
+                  assembleUpload.library({identifier=jenkins@1.1.1, retriever=null})
                   assembleUpload.assembleManifest({buildManifest=tests/data/opensearch-build-1.1.0.yml})
                      assembleManifest.legacySCM(groovy.lang.Closure)
-                     assembleManifest.library({identifier=jenkins@1.0.4, retriever=null})
+                     assembleManifest.library({identifier=jenkins@1.1.1, retriever=null})
                      assembleManifest.readYaml({file=tests/data/opensearch-build-1.1.0.yml})
                      BuildManifest.asBoolean()
                      BuildManifest.getArtifactRootUrlWithoutDistribution(https://ci.opensearch.org/dbc, vars-build, 33)
                      assembleManifest.sh(./assemble.sh "tests/data/opensearch-build-1.1.0.yml" --base-url https://ci.opensearch.org/dbc/vars-build/1.1.0/33/linux/x64)
                   assembleUpload.uploadArtifacts({buildManifest=tests/data/opensearch-build-1.1.0.yml})
                      uploadArtifacts.legacySCM(groovy.lang.Closure)
-                     uploadArtifacts.library({identifier=jenkins@1.0.4, retriever=null})
+                     uploadArtifacts.library({identifier=jenkins@1.1.1, retriever=null})
                      uploadArtifacts.readYaml({file=tests/data/opensearch-build-1.1.0.yml})
                      BuildManifest.asBoolean()
                      BuildManifest.getMinArtifact()

diff --git a/tests/jenkins/jobs/BuildArchive_Jenkinsfile.txt b/tests/jenkins/jobs/BuildArchive_Jenkinsfile.txt
@@ -5,7 +5,7 @@
             BuildArchive_Jenkinsfile.script(groovy.lang.Closure)
                BuildArchive_Jenkinsfile.buildArchive({inputManifest=tests/data/opensearch-1.3.0.yml, platform=linux, architecture=x64, distribution=tar, stashName=test-stash-tar})
                   buildArchive.legacySCM(groovy.lang.Closure)
-                  buildArchive.library({identifier=jenkins@1.0.4, retriever=null})
+                  buildArchive.library({identifier=jenkins@1.1.1, retriever=null})
                   buildArchive.buildManifest({inputManifest=tests/data/opensearch-1.3.0.yml, platform=linux, architecture=x64, distribution=tar, stashName=test-stash-tar})
                      buildManifest.sh(./build.sh tests/data/opensearch-1.3.0.yml -d tar -p linux -a x64)
                   buildArchive.echo(Stashing builds to assemble later with name: test-stash-tar)

diff --git a/tests/jenkins/jobs/BuildAssembleUpload_Jenkinsfile.txt b/tests/jenkins/jobs/BuildAssembleUpload_Jenkinsfile.txt
@@ -5,7 +5,7 @@
             BuildAssembleUpload_Jenkinsfile.script(groovy.lang.Closure)
                BuildAssembleUpload_Jenkinsfile.buildAssembleUpload({inputManifest=tests/data/opensearch-1.3.0.yml, platform=linux, architecture=x64, distribution=tar})
                   buildAssembleUpload.legacySCM(groovy.lang.Closure)
-                  buildAssembleUpload.library({identifier=jenkins@1.0.4, retriever=null})
+                  buildAssembleUpload.library({identifier=jenkins@1.1.1, retriever=null})
                   buildAssembleUpload.readYaml({file=tests/data/opensearch-1.3.0.yml})
                   InputManifest.asBoolean()
                   buildAssembleUpload.buildManifest({inputManifest=tests/data/opensearch-1.3.0.yml, platform=linux, architecture=x64, distribution=tar})
@@ -14,17 +14,17 @@
                   BuildManifest.asBoolean()
                   buildAssembleUpload.assembleUpload({inputManifest=tests/data/opensearch-1.3.0.yml, platform=linux, architecture=x64, distribution=tar, buildManifest=tar/builds/opensearch/manifest.yml})
                      assembleUpload.legacySCM(groovy.lang.Closure)
-                     assembleUpload.library({identifier=jenkins@1.0.4, retriever=null})
+                     assembleUpload.library({identifier=jenkins@1.1.1, retriever=null})
                      assembleUpload.assembleManifest({inputManifest=tests/data/opensearch-1.3.0.yml, platform=linux, architecture=x64, distribution=tar, buildManifest=tar/builds/opensearch/manifest.yml})
                         assembleManifest.legacySCM(groovy.lang.Closure)
-                        assembleManifest.library({identifier=jenkins@1.0.4, retriever=null})
+                        assembleManifest.library({identifier=jenkins@1.1.1, retriever=null})
                         assembleManifest.readYaml({file=tar/builds/opensearch/manifest.yml})
                         BuildManifest.asBoolean()
                         BuildManifest.getArtifactRootUrlWithoutDistribution(https://ci.opensearch.org/dbc, vars-build, 33)
                         assembleManifest.sh(./assemble.sh "tar/builds/opensearch/manifest.yml" --base-url https://ci.opensearch.org/dbc/vars-build/1.3.0/33/linux/x64)
                      assembleUpload.uploadArtifacts({inputManifest=tests/data/opensearch-1.3.0.yml, platform=linux, architecture=x64, distribution=tar, buildManifest=tar/builds/opensearch/manifest.yml})
                         uploadArtifacts.legacySCM(groovy.lang.Closure)
-                        uploadArtifacts.library({identifier=jenkins@1.0.4, retriever=null})
+                        uploadArtifacts.library({identifier=jenkins@1.1.1, retriever=null})
                         uploadArtifacts.readYaml({file=tar/builds/opensearch/manifest.yml})
                         BuildManifest.asBoolean()
                         BuildManifest.getMinArtifact()

diff --git a/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_builds_both.txt b/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_builds_both.txt
@@ -5,7 +5,7 @@
             BuildDockerImage_Jenkinsfile.script(groovy.lang.Closure)
                BuildDockerImage_Jenkinsfile.buildDockerImage({inputManifest=tests/data/opensearch-1.3.0.yml, artifactUrlX64=opensearch.linux.x64, artifactUrlArm64=opensearch.linux.arm64})
                   buildDockerImage.legacySCM(groovy.lang.Closure)
-                  buildDockerImage.library({identifier=jenkins@1.0.4, retriever=null})
+                  buildDockerImage.library({identifier=jenkins@1.1.1, retriever=null})
                   buildDockerImage.readYaml({file=tests/data/opensearch-1.3.0.yml})
                   InputManifest.asBoolean()
                   buildDockerImage.echo(Trigger docker-build)

diff --git a/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_skips_arm64.txt b/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_skips_arm64.txt
@@ -5,7 +5,7 @@
             BuildDockerImage_Jenkinsfile.script(groovy.lang.Closure)
                BuildDockerImage_Jenkinsfile.buildDockerImage({inputManifest=tests/data/opensearch-1.3.0.yml, artifactUrlX64=opensearch.linux.x64, artifactUrlArm64=null})
                   buildDockerImage.legacySCM(groovy.lang.Closure)
-                  buildDockerImage.library({identifier=jenkins@1.0.4, retriever=null})
+                  buildDockerImage.library({identifier=jenkins@1.1.1, retriever=null})
                   buildDockerImage.readYaml({file=tests/data/opensearch-1.3.0.yml})
                   InputManifest.asBoolean()
                   buildDockerImage.echo(Skipping docker build, one of x64 or arm64 artifacts was not built.)
diff --git a/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_skips_both.txt b/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_skips_both.txt
@@ -5,7 +5,7 @@
             BuildDockerImage_Jenkinsfile.script(groovy.lang.Closure)
                BuildDockerImage_Jenkinsfile.buildDockerImage({inputManifest=tests/data/opensearch-1.3.0.yml, artifactUrlX64=null, artifactUrlArm64=null})
                   buildDockerImage.legacySCM(groovy.lang.Closure)
-                  buildDockerImage.library({identifier=jenkins@1.0.4, retriever=null})
+                  buildDockerImage.library({identifier=jenkins@1.1.1, retriever=null})
                   buildDockerImage.readYaml({file=tests/data/opensearch-1.3.0.yml})
                   InputManifest.asBoolean()
                   buildDockerImage.echo(Skipping docker build, one of x64 or arm64 artifacts was not built.)
diff --git a/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_skips_x64.txt b/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_skips_x64.txt
@@ -5,7 +5,7 @@
             BuildDockerImage_Jenkinsfile.script(groovy.lang.Closure)
                BuildDockerImage_Jenkinsfile.buildDockerImage({inputManifest=tests/data/opensearch-1.3.0.yml, artifactUrlX64=null, artifactUrlArm64=opensearch.linux.arm64})
                   buildDockerImage.legacySCM(groovy.lang.Closure)
-                  buildDockerImage.library({identifier=jenkins@1.0.4, retriever=null})
+                  buildDockerImage.library({identifier=jenkins@1.1.1, retriever=null})
                   buildDockerImage.readYaml({file=tests/data/opensearch-1.3.0.yml})
                   InputManifest.asBoolean()
                   buildDockerImage.echo(Skipping docker build, one of x64 or arm64 artifacts was not built.)
diff --git a/tests/jenkins/jobs/BuildDockerImage_Qualifier_Jenkinsfile_builds_both.txt b/tests/jenkins/jobs/BuildDockerImage_Qualifier_Jenkinsfile_builds_both.txt
@@ -5,7 +5,7 @@
             BuildDockerImage_Qualifier_Jenkinsfile.script(groovy.lang.Closure)
                BuildDockerImage_Qualifier_Jenkinsfile.buildDockerImage({inputManifest=tests/data/opensearch-2.0.0.yml, artifactUrlX64=opensearch.linux.x64, artifactUrlArm64=opensearch.linux.arm64})
                   buildDockerImage.legacySCM(groovy.lang.Closure)
-                  buildDockerImage.library({identifier=jenkins@1.0.4, retriever=null})
+                  buildDockerImage.library({identifier=jenkins@1.1.1, retriever=null})
                   buildDockerImage.readYaml({file=tests/data/opensearch-2.0.0.yml})
                   InputManifest.asBoolean()
                   buildDockerImage.echo(Trigger docker-build)

diff --git a/tests/jenkins/jobs/BuildUploadManifestSHA_Jenkinsfile.txt b/tests/jenkins/jobs/BuildUploadManifestSHA_Jenkinsfile.txt
@@ -5,14 +5,14 @@
             BuildUploadManifestSHA_Jenkinsfile.script(groovy.lang.Closure)
                BuildUploadManifestSHA_Jenkinsfile.buildUploadManifestSHA({inputManifest=tests/data/opensearch-1.3.0.yml, platform=linux, architecture=x64})
                   buildUploadManifestSHA.legacySCM(groovy.lang.Closure)
-                  buildUploadManifestSHA.library({identifier=jenkins@1.0.4, retriever=null})
+                  buildUploadManifestSHA.library({identifier=jenkins@1.1.1, retriever=null})
                   buildUploadManifestSHA.getManifestSHA({inputManifest=tests/data/opensearch-1.3.0.yml, platform=linux, architecture=x64})
                      getManifestSHA.buildManifest({inputManifest=tests/data/opensearch-1.3.0.yml, platform=linux, architecture=x64, lock=true})
                         buildManifest.sh(./build.sh tests/data/opensearch-1.3.0.yml -p linux -a x64 --lock)
                      getManifestSHA.sha1(tests/data/opensearch-1.3.0.yml.lock)
                      getManifestSHA.echo(Manifest SHA: sha1)
                      getManifestSHA.legacySCM(groovy.lang.Closure)
-                     getManifestSHA.library({identifier=jenkins@1.0.4, retriever=null})
+                     getManifestSHA.library({identifier=jenkins@1.1.1, retriever=null})
                      getManifestSHA.readYaml({file=tests/data/opensearch-1.3.0.yml.lock})
                      InputManifest.asBoolean()
                      InputManifest.getSHAsRoot(get-manifest-sha-build)

diff --git a/tests/jenkins/jobs/BuildYumRepo_Jenkinsfile.txt b/tests/jenkins/jobs/BuildYumRepo_Jenkinsfile.txt
@@ -5,7 +5,7 @@
             BuildYumRepo_Jenkinsfile.script(groovy.lang.Closure)
                BuildYumRepo_Jenkinsfile.buildYumRepo({buildManifest=tests/data/opensearch-build-1.3.0.yml, baseUrl=https://ci.opensearch.org/ci/dbc/test/1.3.0/9/linux/x64})
                   buildYumRepo.legacySCM(groovy.lang.Closure)
-                  buildYumRepo.library({identifier=jenkins@1.0.4, retriever=null})
+                  buildYumRepo.library({identifier=jenkins@1.1.1, retriever=null})
                   buildYumRepo.readYaml({file=tests/data/opensearch-build-1.3.0.yml})
                   BuildManifest.asBoolean()
                   buildYumRepo.echo(Create yum repo metadata and repo file tests/data/opensearch-build-1.3.0.yml)

diff --git a/tests/jenkins/jobs/CreateReleaseTag_Jenkinsfile.txt b/tests/jenkins/jobs/CreateReleaseTag_Jenkinsfile.txt
@@ -5,7 +5,7 @@
             CreateReleaseTag_Jenkinsfile.script(groovy.lang.Closure)
                CreateReleaseTag_Jenkinsfile.createReleaseTag({distManifest=tests/data/opensearch-build-1.1.0.yml, tagVersion=1.1.0})
                   createReleaseTag.legacySCM(groovy.lang.Closure)
-                  createReleaseTag.library({identifier=jenkins@1.0.4, retriever=null})
+                  createReleaseTag.library({identifier=jenkins@1.1.1, retriever=null})
                   createReleaseTag.readYaml({file=tests/data/opensearch-build-1.1.0.yml})
                   BundleManifest.asBoolean()
                   BundleManifest.getNames()

diff --git a/tests/jenkins/jobs/DetectDockerImage_Jenkinsfile.txt b/tests/jenkins/jobs/DetectDockerImage_Jenkinsfile.txt
@@ -5,7 +5,7 @@
             DetectDockerImage_Jenkinsfile.script(groovy.lang.Closure)
                DetectDockerImage_Jenkinsfile.detectDockerAgent({manifest=tests/data/os-template-1.1.0.yml})
                   detectDockerAgent.legacySCM(groovy.lang.Closure)
-                  detectDockerAgent.library({identifier=jenkins@1.0.4, retriever=null})
+                  detectDockerAgent.library({identifier=jenkins@1.1.1, retriever=null})
                   detectDockerAgent.readYaml({file=tests/data/os-template-1.1.0.yml})
                   InputManifest.asBoolean()
                   detectDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:ci-runner-centos7-v1 (null))
@@ -14,7 +14,7 @@
             DetectDockerImage_Jenkinsfile.script(groovy.lang.Closure)
                DetectDockerImage_Jenkinsfile.detectDockerAgent({manifest=tests/data/os-template-1.2.0.yml})
                   detectDockerAgent.legacySCM(groovy.lang.Closure)
-                  detectDockerAgent.library({identifier=jenkins@1.0.4, retriever=null})
+                  detectDockerAgent.library({identifier=jenkins@1.1.1, retriever=null})
                   detectDockerAgent.readYaml({file=tests/data/os-template-1.2.0.yml})
                   InputManifest.asBoolean()
                   detectDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028 (-e JAVA_HOME=/usr/lib/jvm/adoptopenjdk-14-hotspot))
@@ -26,7 +26,7 @@
             DetectDockerImage_Jenkinsfile.script(groovy.lang.Closure)
                DetectDockerImage_Jenkinsfile.detectDockerAgent({manifest=tests/data/osd-template-1.1.0.yml})
                   detectDockerAgent.legacySCM(groovy.lang.Closure)
-                  detectDockerAgent.library({identifier=jenkins@1.0.4, retriever=null})
+                  detectDockerAgent.library({identifier=jenkins@1.1.1, retriever=null})
                   detectDockerAgent.readYaml({file=tests/data/osd-template-1.1.0.yml})
                   InputManifest.asBoolean()
                   detectDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028 (null))
@@ -38,7 +38,7 @@
             DetectDockerImage_Jenkinsfile.script(groovy.lang.Closure)
                DetectDockerImage_Jenkinsfile.detectDockerAgent({manifest=tests/data/opensearch-dashboards-1.2.0.yml})
                   detectDockerAgent.legacySCM(groovy.lang.Closure)
-                  detectDockerAgent.library({identifier=jenkins@1.0.4, retriever=null})
+                  detectDockerAgent.library({identifier=jenkins@1.1.1, retriever=null})
                   detectDockerAgent.readYaml({file=tests/data/opensearch-dashboards-1.2.0.yml})
                   InputManifest.asBoolean()
                   detectDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028 (null))