Revert "Load the code under src by importing and not via shared libra…

…ries (#15)" (#19) This reverts commit ba0e2c0.
opensearch-project · Oct 18, 2022 · 5562b46 · 5562b46
1 parent 78cf9d1
commit 5562b46
Show file tree

Hide file tree

Showing 65 changed files with 233 additions and 85 deletions.
diff --git a/tests/jenkins/jobs/ArchiveAssembleUpload_Jenkinsfile.txt b/tests/jenkins/jobs/ArchiveAssembleUpload_Jenkinsfile.txt
@@ -4,20 +4,30 @@
          ArchiveAssembleUpload_Jenkinsfile.stage(assemble from archive, groovy.lang.Closure)
             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@main, 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)
                   archiveAssembleUpload.unstash(test-stash-tar)
                   archiveAssembleUpload.echo(Assembling tests/data/opensearch-1.3.0.yml)
                   archiveAssembleUpload.readYaml({file=tar/builds/opensearch/manifest.yml})
+                  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, retriever=null})
+                     assembleUpload.library({identifier=jenkins@main, 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@main, 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@main, retriever=null})
                         uploadArtifacts.readYaml({file=tar/builds/opensearch/manifest.yml})
+                        BuildManifest.asBoolean()
                         BuildManifest.getMinArtifact()
                         BuildManifest.getArtifactRoot(vars-build, 33)
                         uploadArtifacts.string({credentialsId=jenkins-artifact-bucket-name, variable=ARTIFACT_BUCKET_NAME})
@@ -41,6 +51,7 @@
                               uploadArtifacts.s3Upload({file=tar/builds/opensearch/dist/opensearch-min-1.3.0-linux-x64.tar.gz, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=release-candidates/core/opensearch/1.3.0/})
                               uploadArtifacts.s3Upload({file=tar/dist/opensearch/opensearch-1.3.0-linux-x64.tar.gz, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=release-candidates/bundle/opensearch/1.3.0/})
                         BuildManifest.getArtifactRootUrl(https://ci.opensearch.org/dbc, vars-build, 33)
+                        Messages.asBoolean()
                         Messages.add(stage, https://ci.opensearch.org/dbc/vars-build/1.3.0/33/linux/x64/tar/builds/opensearch/manifest.yml
 https://ci.opensearch.org/dbc/vars-build/1.3.0/33/linux/x64/tar/dist/opensearch/manifest.yml)
                            uploadArtifacts.writeFile({file=messages/stage.msg, text=https://ci.opensearch.org/dbc/vars-build/1.3.0/33/linux/x64/tar/builds/opensearch/manifest.yml

diff --git a/tests/jenkins/jobs/AssembleManifest_rpm_Jenkinsfile.txt b/tests/jenkins/jobs/AssembleManifest_rpm_Jenkinsfile.txt
@@ -4,7 +4,10 @@
          AssembleManifest_rpm_Jenkinsfile.stage(assembleManifest rpm, groovy.lang.Closure)
             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@main, 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)
                   assembleManifest.sh(./assemble.sh "tests/data/opensearch-build-1.3.0-rpm.yml" --base-url https://ci.opensearch.org/dbc/vars-build/1.3.0/123/linux/x64)
                   assembleManifest.signArtifacts({artifactPath=rpm/dist/opensearch, sigtype=.rpm, platform=linux})
@@ -88,7 +91,10 @@
 
                     )
                   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@main, 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)
                      buildYumRepo.sh(createrepo "rpm/dist/opensearch")
                      buildYumRepo.writeFile({file=rpm/dist/opensearch/opensearch-1.3.0.staging.repo, text=[opensearch-1.3.0-123-staging]

diff --git a/tests/jenkins/jobs/AssembleManifest_tar_Jenkinsfile.txt b/tests/jenkins/jobs/AssembleManifest_tar_Jenkinsfile.txt
@@ -4,6 +4,9 @@
          AssembleManifest_tar_Jenkinsfile.stage(assembleManifest tar, groovy.lang.Closure)
             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@main, 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)
                   assembleManifest.sh(./assemble.sh "tests/data/opensearch-build-1.3.0.yml" --base-url https://ci.opensearch.org/dbc/vars-build/1.3.0/123/linux/x64)
diff --git a/tests/jenkins/jobs/AssembleUpload_Jenkinsfile.txt b/tests/jenkins/jobs/AssembleUpload_Jenkinsfile.txt
@@ -5,13 +5,19 @@
             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, retriever=null})
+                  assembleUpload.library({identifier=jenkins@main, retriever=null})
                   assembleUpload.assembleManifest({buildManifest=tests/data/opensearch-build-1.1.0.yml})
+                     assembleManifest.legacySCM(groovy.lang.Closure)
+                     assembleManifest.library({identifier=jenkins@main, 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@main, retriever=null})
                      uploadArtifacts.readYaml({file=tests/data/opensearch-build-1.1.0.yml})
+                     BuildManifest.asBoolean()
                      BuildManifest.getMinArtifact()
                      BuildManifest.getArtifactRoot(vars-build, 33)
                      uploadArtifacts.string({credentialsId=jenkins-artifact-bucket-name, variable=ARTIFACT_BUCKET_NAME})
@@ -35,6 +41,7 @@
                            uploadArtifacts.s3Upload({file=tar/builds/opensearch/dist/opensearch-min-1.1.0-linux-x64.tar.gz, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=release-candidates/core/opensearch/1.1.0/})
                            uploadArtifacts.s3Upload({file=tar/dist/opensearch/opensearch-1.1.0-linux-x64.tar.gz, bucket=ARTIFACT_PRODUCTION_BUCKET_NAME, path=release-candidates/bundle/opensearch/1.1.0/})
                      BuildManifest.getArtifactRootUrl(https://ci.opensearch.org/dbc, vars-build, 33)
+                     Messages.asBoolean()
                      Messages.add(stage, https://ci.opensearch.org/dbc/vars-build/1.1.0/33/linux/x64/tar/builds/opensearch/manifest.yml
 https://ci.opensearch.org/dbc/vars-build/1.1.0/33/linux/x64/tar/dist/opensearch/manifest.yml)
                         uploadArtifacts.writeFile({file=messages/stage.msg, text=https://ci.opensearch.org/dbc/vars-build/1.1.0/33/linux/x64/tar/builds/opensearch/manifest.yml

diff --git a/tests/jenkins/jobs/BuildArchive_Jenkinsfile.txt b/tests/jenkins/jobs/BuildArchive_Jenkinsfile.txt
@@ -4,10 +4,13 @@
          BuildArchive_Jenkinsfile.stage(build and archive, groovy.lang.Closure)
             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@main, 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)
                   buildArchive.stash({includes=tar/builds/**, name=test-stash-tar})
+                  Messages.asBoolean()
                   Messages.add(stage, Built stage.)
                      buildArchive.writeFile({file=messages/stage.msg, text=Built stage.})
                      buildArchive.stash({includes=messages/*, name=messages-stage})
diff --git a/tests/jenkins/jobs/BuildAssembleUpload_Jenkinsfile.txt b/tests/jenkins/jobs/BuildAssembleUpload_Jenkinsfile.txt
@@ -4,19 +4,29 @@
          BuildAssembleUpload_Jenkinsfile.stage(build and assemble, groovy.lang.Closure)
             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@main, 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})
                      buildManifest.sh(./build.sh tests/data/opensearch-1.3.0.yml -d tar -p linux -a x64)
                   buildAssembleUpload.readYaml({file=tar/builds/opensearch/manifest.yml})
+                  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, retriever=null})
+                     assembleUpload.library({identifier=jenkins@main, 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@main, 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@main, retriever=null})
                         uploadArtifacts.readYaml({file=tar/builds/opensearch/manifest.yml})
+                        BuildManifest.asBoolean()
                         BuildManifest.getMinArtifact()
                         BuildManifest.getArtifactRoot(vars-build, 33)
                         uploadArtifacts.string({credentialsId=jenkins-artifact-bucket-name, variable=ARTIFACT_BUCKET_NAME})
@@ -40,6 +50,7 @@
                               uploadArtifacts.s3Upload({file=tar/builds/opensearch/dist/opensearch-min-1.3.0-linux-x64.tar.gz, bucket=bucket, path=release-candidates/core/opensearch/1.3.0/})
                               uploadArtifacts.s3Upload({file=tar/dist/opensearch/opensearch-1.3.0-linux-x64.tar.gz, bucket=bucket, path=release-candidates/bundle/opensearch/1.3.0/})
                         BuildManifest.getArtifactRootUrl(https://ci.opensearch.org/dbc, vars-build, 33)
+                        Messages.asBoolean()
                         Messages.add(stage, https://ci.opensearch.org/dbc/vars-build/1.3.0/33/linux/x64/tar/builds/opensearch/manifest.yml
 https://ci.opensearch.org/dbc/vars-build/1.3.0/33/linux/x64/tar/dist/opensearch/manifest.yml)
                            uploadArtifacts.writeFile({file=messages/stage.msg, text=https://ci.opensearch.org/dbc/vars-build/1.3.0/33/linux/x64/tar/builds/opensearch/manifest.yml

diff --git a/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_builds_both.txt b/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_builds_both.txt
@@ -4,7 +4,10 @@
          BuildDockerImage_Jenkinsfile.stage(build docker image, groovy.lang.Closure)
             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@main, retriever=null})
                   buildDockerImage.readYaml({file=tests/data/opensearch-1.3.0.yml})
+                  InputManifest.asBoolean()
                   buildDockerImage.echo(Trigger docker-build)
                   buildDockerImage.string({name=DOCKER_BUILD_GIT_REPOSITORY, value=https://github.com/opensearch-project/opensearch-build})
                   buildDockerImage.string({name=DOCKER_BUILD_GIT_REPOSITORY_REFERENCE, value=main})

diff --git a/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_skips_arm64.txt b/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_skips_arm64.txt
@@ -4,5 +4,8 @@
          BuildDockerImage_Jenkinsfile.stage(build docker image, groovy.lang.Closure)
             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@main, 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
@@ -4,5 +4,8 @@
          BuildDockerImage_Jenkinsfile.stage(build docker image, groovy.lang.Closure)
             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@main, 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
@@ -4,5 +4,8 @@
          BuildDockerImage_Jenkinsfile.stage(build docker image, groovy.lang.Closure)
             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@main, 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
@@ -4,7 +4,10 @@
          BuildDockerImage_Qualifier_Jenkinsfile.stage(build docker image, groovy.lang.Closure)
             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@main, retriever=null})
                   buildDockerImage.readYaml({file=tests/data/opensearch-2.0.0.yml})
+                  InputManifest.asBoolean()
                   buildDockerImage.echo(Trigger docker-build)
                   buildDockerImage.string({name=DOCKER_BUILD_GIT_REPOSITORY, value=https://github.com/opensearch-project/opensearch-build})
                   buildDockerImage.string({name=DOCKER_BUILD_GIT_REPOSITORY_REFERENCE, value=main})