diff --git a/tests/jenkins/jobs/ArchiveAssembleUpload_Jenkinsfile.txt b/tests/jenkins/jobs/ArchiveAssembleUpload_Jenkinsfile.txt index 11de599c8..d71a27181 100644 --- a/tests/jenkins/jobs/ArchiveAssembleUpload_Jenkinsfile.txt +++ b/tests/jenkins/jobs/ArchiveAssembleUpload_Jenkinsfile.txt @@ -4,30 +4,20 @@ 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@main, retriever=null}) + assembleUpload.library({identifier=jenkins, 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}) @@ -51,7 +41,6 @@ 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 index 715485fb1..23eb939df 100644 --- a/tests/jenkins/jobs/AssembleManifest_rpm_Jenkinsfile.txt +++ b/tests/jenkins/jobs/AssembleManifest_rpm_Jenkinsfile.txt @@ -4,10 +4,7 @@ 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}) @@ -91,10 +88,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@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 index f77048462..a776f65a7 100644 --- a/tests/jenkins/jobs/AssembleManifest_tar_Jenkinsfile.txt +++ b/tests/jenkins/jobs/AssembleManifest_tar_Jenkinsfile.txt @@ -4,9 +4,6 @@ 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 index 00cc4340e..7c6b0dcfb 100644 --- a/tests/jenkins/jobs/AssembleUpload_Jenkinsfile.txt +++ b/tests/jenkins/jobs/AssembleUpload_Jenkinsfile.txt @@ -5,19 +5,13 @@ 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@main, retriever=null}) + assembleUpload.library({identifier=jenkins, 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}) @@ -41,7 +35,6 @@ 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 index f66781fb9..48f724c85 100644 --- a/tests/jenkins/jobs/BuildArchive_Jenkinsfile.txt +++ b/tests/jenkins/jobs/BuildArchive_Jenkinsfile.txt @@ -4,13 +4,10 @@ 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 index aabca8551..f13411d30 100644 --- a/tests/jenkins/jobs/BuildAssembleUpload_Jenkinsfile.txt +++ b/tests/jenkins/jobs/BuildAssembleUpload_Jenkinsfile.txt @@ -4,29 +4,19 @@ 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@main, retriever=null}) + assembleUpload.library({identifier=jenkins, 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}) @@ -50,7 +40,6 @@ 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 index b4e3132d7..7cbb9f83a 100644 --- a/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_builds_both.txt +++ b/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_builds_both.txt @@ -4,10 +4,7 @@ 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 index 06f3c6683..772a9eb0f 100644 --- a/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_skips_arm64.txt +++ b/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_skips_arm64.txt @@ -4,8 +4,5 @@ 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 index 22f1b936c..5064f12fd 100644 --- a/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_skips_both.txt +++ b/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_skips_both.txt @@ -4,8 +4,5 @@ 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 index 875baa480..a8cb60155 100644 --- a/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_skips_x64.txt +++ b/tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_skips_x64.txt @@ -4,8 +4,5 @@ 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 index 640b3b170..4ba188b45 100644 --- a/tests/jenkins/jobs/BuildDockerImage_Qualifier_Jenkinsfile_builds_both.txt +++ b/tests/jenkins/jobs/BuildDockerImage_Qualifier_Jenkinsfile_builds_both.txt @@ -4,10 +4,7 @@ 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}) diff --git a/tests/jenkins/jobs/BuildUploadManifestSHA_Jenkinsfile.txt b/tests/jenkins/jobs/BuildUploadManifestSHA_Jenkinsfile.txt index 0827ddeed..c3950b865 100644 --- a/tests/jenkins/jobs/BuildUploadManifestSHA_Jenkinsfile.txt +++ b/tests/jenkins/jobs/BuildUploadManifestSHA_Jenkinsfile.txt @@ -4,17 +4,12 @@ BuildUploadManifestSHA_Jenkinsfile.stage(upload manifest SHA, groovy.lang.Closure) 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@main, 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@main, retriever=null}) getManifestSHA.readYaml({file=tests/data/opensearch-1.3.0.yml.lock}) - InputManifest.asBoolean() InputManifest.getSHAsRoot(get-manifest-sha-build) getManifestSHA.echo(Manifest lock: tests/data/opensearch-1.3.0.yml.lock) getManifestSHA.echo(Manifest SHA path: get-manifest-sha-build/1.3.0/shas/sha1.yml) diff --git a/tests/jenkins/jobs/BuildYumRepo_Jenkinsfile.txt b/tests/jenkins/jobs/BuildYumRepo_Jenkinsfile.txt index d938a1a83..8cd9645cd 100644 --- a/tests/jenkins/jobs/BuildYumRepo_Jenkinsfile.txt +++ b/tests/jenkins/jobs/BuildYumRepo_Jenkinsfile.txt @@ -4,10 +4,7 @@ BuildYumRepo_Jenkinsfile.stage(buildYumRepo, groovy.lang.Closure) 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@main, 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) 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/CreateReleaseTag_Jenkinsfile.txt b/tests/jenkins/jobs/CreateReleaseTag_Jenkinsfile.txt index e815654fc..93d9aa2d2 100644 --- a/tests/jenkins/jobs/CreateReleaseTag_Jenkinsfile.txt +++ b/tests/jenkins/jobs/CreateReleaseTag_Jenkinsfile.txt @@ -4,10 +4,7 @@ CreateReleaseTag_Jenkinsfile.stage(createTag, groovy.lang.Closure) 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@main, retriever=null}) createReleaseTag.readYaml({file=tests/data/opensearch-build-1.1.0.yml}) - BundleManifest.asBoolean() BundleManifest.getNames() createReleaseTag.echo(Creating 1.1.0 release tag for 15 components in the manifest) createReleaseTag.usernamePassword({credentialsId=dummy_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN}) diff --git a/tests/jenkins/jobs/DetectDockerImage_Jenkinsfile.txt b/tests/jenkins/jobs/DetectDockerImage_Jenkinsfile.txt index 0377253a4..0a5e2b0f7 100644 --- a/tests/jenkins/jobs/DetectDockerImage_Jenkinsfile.txt +++ b/tests/jenkins/jobs/DetectDockerImage_Jenkinsfile.txt @@ -4,19 +4,13 @@ DetectDockerImage_Jenkinsfile.stage(opensearch-1.1.0, groovy.lang.Closure) 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@main, 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)) detectDockerAgent.echo(Using java version openjdk-17) DetectDockerImage_Jenkinsfile.stage(opensearch-1.2.0, groovy.lang.Closure) 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@main, 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)) detectDockerAgent.echo(Using java version openjdk-14) DetectDockerImage_Jenkinsfile.echo(opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028) @@ -25,10 +19,7 @@ DetectDockerImage_Jenkinsfile.stage(opensearch-dashboards-1.1.0, groovy.lang.Closure) 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@main, 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)) detectDockerAgent.echo(Using java version openjdk-17) DetectDockerImage_Jenkinsfile.echo(opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028) @@ -37,10 +28,7 @@ DetectDockerImage_Jenkinsfile.stage(opensearch-dashboards-1.2.0, groovy.lang.Closure) 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@main, 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)) detectDockerAgent.echo(Using java version openjdk-17) DetectDockerImage_Jenkinsfile.echo(opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028) diff --git a/tests/jenkins/jobs/DetectTestDockerAgent_Jenkinsfile.txt b/tests/jenkins/jobs/DetectTestDockerAgent_Jenkinsfile.txt index b735ff406..6bb89249c 100644 --- a/tests/jenkins/jobs/DetectTestDockerAgent_Jenkinsfile.txt +++ b/tests/jenkins/jobs/DetectTestDockerAgent_Jenkinsfile.txt @@ -4,8 +4,5 @@ DetectTestDockerAgent_Jenkinsfile.stage(detect test docker, groovy.lang.Closure) DetectTestDockerAgent_Jenkinsfile.script(groovy.lang.Closure) DetectTestDockerAgent_Jenkinsfile.detectTestDockerAgent({testManifest=tests/data/opensearch-1.3.0-test.yml}) - detectTestDockerAgent.legacySCM(groovy.lang.Closure) - detectTestDockerAgent.library({identifier=jenkins@main, retriever=null}) detectTestDockerAgent.readYaml({file=tests/data/opensearch-1.3.0-test.yml}) - TestManifest.asBoolean() detectTestDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:ci-runner-centos7-v1 (null)) diff --git a/tests/jenkins/jobs/GetManifestSHA_Jenkinsfile_does_not_exist.txt b/tests/jenkins/jobs/GetManifestSHA_Jenkinsfile_does_not_exist.txt index 9a210e66a..54d7ed215 100644 --- a/tests/jenkins/jobs/GetManifestSHA_Jenkinsfile_does_not_exist.txt +++ b/tests/jenkins/jobs/GetManifestSHA_Jenkinsfile_does_not_exist.txt @@ -8,10 +8,7 @@ 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@main, retriever=null}) getManifestSHA.readYaml({file=tests/data/opensearch-1.3.0.yml.lock}) - InputManifest.asBoolean() InputManifest.getSHAsRoot(get-manifest-sha-build) getManifestSHA.echo(Manifest lock: tests/data/opensearch-1.3.0.yml.lock) getManifestSHA.echo(Manifest SHA path: get-manifest-sha-build/1.3.0/shas/sha1.yml) diff --git a/tests/jenkins/jobs/GetManifestSHA_Jenkinsfile_exists.txt b/tests/jenkins/jobs/GetManifestSHA_Jenkinsfile_exists.txt index d95191bc2..ff5ac86f6 100644 --- a/tests/jenkins/jobs/GetManifestSHA_Jenkinsfile_exists.txt +++ b/tests/jenkins/jobs/GetManifestSHA_Jenkinsfile_exists.txt @@ -8,10 +8,7 @@ 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@main, retriever=null}) getManifestSHA.readYaml({file=tests/data/opensearch-1.3.0.yml.lock}) - InputManifest.asBoolean() InputManifest.getSHAsRoot(get-manifest-sha-build) getManifestSHA.echo(Manifest lock: tests/data/opensearch-1.3.0.yml.lock) getManifestSHA.echo(Manifest SHA path: get-manifest-sha-build/1.3.0/shas/sha1.yml) diff --git a/tests/jenkins/jobs/PerfTest_Jenkinsfile.txt b/tests/jenkins/jobs/PerfTest_Jenkinsfile.txt index a56af91c0..f220dd4e5 100644 --- a/tests/jenkins/jobs/PerfTest_Jenkinsfile.txt +++ b/tests/jenkins/jobs/PerfTest_Jenkinsfile.txt @@ -4,16 +4,10 @@ PerfTest_Jenkinsfile.stage(test-with-security, groovy.lang.Closure) PerfTest_Jenkinsfile.script(groovy.lang.Closure) PerfTest_Jenkinsfile.downloadBuildManifest({url=test://artifact.url, path=tests/data/opensearch-1.3.0-bundle.yml}) - downloadBuildManifest.legacySCM(groovy.lang.Closure) - downloadBuildManifest.library({identifier=jenkins@main, retriever=null}) downloadBuildManifest.sh(curl -sSL test://artifact.url --output tests/data/opensearch-1.3.0-bundle.yml) downloadBuildManifest.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) - BuildManifest.asBoolean() PerfTest_Jenkinsfile.runPerfTestScript({bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, buildId=1236, architecture=x64, insecure=false, workload=nyc_taxis, testIterations=1, warmupIterations=1, stackNameSuffix=307}) - runPerfTestScript.legacySCM(groovy.lang.Closure) - runPerfTestScript.library({identifier=jenkins@main, retriever=null}) runPerfTestScript.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) - BuildManifest.asBoolean() runPerfTestScript.sh( pipenv install "dataclasses_json~=0.5" "aws_requests_auth~=0.4" "json2html~=1.3.0" pipenv install "aws-cdk.core~=1.143.0" "aws_cdk.aws_ec2~=1.143.0" "aws_cdk.aws_iam~=1.143.0" @@ -30,16 +24,10 @@ PerfTest_Jenkinsfile.stage(test-without-security, groovy.lang.Closure) PerfTest_Jenkinsfile.script(groovy.lang.Closure) PerfTest_Jenkinsfile.downloadBuildManifest({url=test://artifact.url, path=tests/data/opensearch-1.3.0-bundle.yml}) - downloadBuildManifest.legacySCM(groovy.lang.Closure) - downloadBuildManifest.library({identifier=jenkins@main, retriever=null}) downloadBuildManifest.sh(curl -sSL test://artifact.url --output tests/data/opensearch-1.3.0-bundle.yml) downloadBuildManifest.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) - BuildManifest.asBoolean() PerfTest_Jenkinsfile.runPerfTestScript({bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, buildId=1236, architecture=x64, insecure=true, workload=nyc_taxis, testIterations=1, warmupIterations=1, stackNameSuffix=307}) - runPerfTestScript.legacySCM(groovy.lang.Closure) - runPerfTestScript.library({identifier=jenkins@main, retriever=null}) runPerfTestScript.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml}) - BuildManifest.asBoolean() runPerfTestScript.sh( pipenv install "dataclasses_json~=0.5" "aws_requests_auth~=0.4" "json2html~=1.3.0" pipenv install "aws-cdk.core~=1.143.0" "aws_cdk.aws_ec2~=1.143.0" "aws_cdk.aws_iam~=1.143.0" diff --git a/tests/jenkins/jobs/PromoteArtifactsQualifier_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteArtifactsQualifier_Jenkinsfile.txt index 9083600e5..c0e69d588 100644 --- a/tests/jenkins/jobs/PromoteArtifactsQualifier_Jenkinsfile.txt +++ b/tests/jenkins/jobs/PromoteArtifactsQualifier_Jenkinsfile.txt @@ -4,10 +4,7 @@ PromoteArtifactsQualifier_Jenkinsfile.stage(promote, groovy.lang.Closure) PromoteArtifactsQualifier_Jenkinsfile.script(groovy.lang.Closure) PromoteArtifactsQualifier_Jenkinsfile.promoteArtifacts({manifest=tests/data/opensearch-2.0.0-rc1.yml}) - promoteArtifacts.legacySCM(groovy.lang.Closure) - promoteArtifacts.library({identifier=jenkins@main, retriever=null}) promoteArtifacts.readYaml({file=tests/data/opensearch-2.0.0-rc1.yml}) - InputManifest.asBoolean() promoteArtifacts.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) promoteArtifacts.string({credentialsId=jenkins-artifact-bucket-name, variable=ARTIFACT_BUCKET_NAME}) promoteArtifacts.string({credentialsId=jenkins-artifact-promotion-role, variable=ARTIFACT_PROMOTION_ROLE_NAME}) diff --git a/tests/jenkins/jobs/PromoteArtifactsQualifier_OpenSearch_Dashboards_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteArtifactsQualifier_OpenSearch_Dashboards_Jenkinsfile.txt index 23d99360c..dff7a43fe 100644 --- a/tests/jenkins/jobs/PromoteArtifactsQualifier_OpenSearch_Dashboards_Jenkinsfile.txt +++ b/tests/jenkins/jobs/PromoteArtifactsQualifier_OpenSearch_Dashboards_Jenkinsfile.txt @@ -4,10 +4,7 @@ PromoteArtifactsQualifier_OpenSearch_Dashboards_Jenkinsfile.stage(promote, groovy.lang.Closure) PromoteArtifactsQualifier_OpenSearch_Dashboards_Jenkinsfile.script(groovy.lang.Closure) PromoteArtifactsQualifier_OpenSearch_Dashboards_Jenkinsfile.promoteArtifacts({manifest=tests/data/opensearch-dashboards-2.0.0-rc1.yml}) - promoteArtifacts.legacySCM(groovy.lang.Closure) - promoteArtifacts.library({identifier=jenkins@main, retriever=null}) promoteArtifacts.readYaml({file=tests/data/opensearch-dashboards-2.0.0-rc1.yml}) - InputManifest.asBoolean() promoteArtifacts.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) promoteArtifacts.string({credentialsId=jenkins-artifact-bucket-name, variable=ARTIFACT_BUCKET_NAME}) promoteArtifacts.string({credentialsId=jenkins-artifact-promotion-role, variable=ARTIFACT_PROMOTION_ROLE_NAME}) diff --git a/tests/jenkins/jobs/PromoteArtifactsQualifier_actions_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteArtifactsQualifier_actions_Jenkinsfile.txt index f89f2229c..d0c2e0872 100644 --- a/tests/jenkins/jobs/PromoteArtifactsQualifier_actions_Jenkinsfile.txt +++ b/tests/jenkins/jobs/PromoteArtifactsQualifier_actions_Jenkinsfile.txt @@ -5,13 +5,8 @@ PromoteArtifactsQualifier_actions_Jenkinsfile.script(groovy.lang.Closure) PromoteArtifactsQualifier_actions_Jenkinsfile.createSha512Checksums() PromoteArtifactsQualifier_actions_Jenkinsfile.createSignatureFiles() - createSignatureFiles.legacySCM(groovy.lang.Closure) - createSignatureFiles.library({identifier=jenkins@main, retriever=null}) PromoteArtifactsQualifier_actions_Jenkinsfile.promoteArtifacts({manifest=tests/data/opensearch-2.0.0-rc1.yml, fileActions=[groovy.lang.Closure, groovy.lang.Closure]}) - promoteArtifacts.legacySCM(groovy.lang.Closure) - promoteArtifacts.library({identifier=jenkins@main, retriever=null}) promoteArtifacts.readYaml({file=tests/data/opensearch-2.0.0-rc1.yml}) - InputManifest.asBoolean() promoteArtifacts.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) promoteArtifacts.string({credentialsId=jenkins-artifact-bucket-name, variable=ARTIFACT_BUCKET_NAME}) promoteArtifacts.string({credentialsId=jenkins-artifact-promotion-role, variable=ARTIFACT_PROMOTION_ROLE_NAME}) diff --git a/tests/jenkins/jobs/PromoteArtifactsQualifier_actions_OpenSearch_Dashboards_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteArtifactsQualifier_actions_OpenSearch_Dashboards_Jenkinsfile.txt index f905e4ab5..14b49562d 100644 --- a/tests/jenkins/jobs/PromoteArtifactsQualifier_actions_OpenSearch_Dashboards_Jenkinsfile.txt +++ b/tests/jenkins/jobs/PromoteArtifactsQualifier_actions_OpenSearch_Dashboards_Jenkinsfile.txt @@ -5,13 +5,8 @@ PromoteArtifactsQualifier_actions_OpenSearch_Dashboards_Jenkinsfile.script(groovy.lang.Closure) PromoteArtifactsQualifier_actions_OpenSearch_Dashboards_Jenkinsfile.createSha512Checksums() PromoteArtifactsQualifier_actions_OpenSearch_Dashboards_Jenkinsfile.createSignatureFiles() - createSignatureFiles.legacySCM(groovy.lang.Closure) - createSignatureFiles.library({identifier=jenkins@main, retriever=null}) PromoteArtifactsQualifier_actions_OpenSearch_Dashboards_Jenkinsfile.promoteArtifacts({manifest=tests/data/opensearch-dashboards-2.0.0-rc1.yml, fileActions=[groovy.lang.Closure, groovy.lang.Closure]}) - promoteArtifacts.legacySCM(groovy.lang.Closure) - promoteArtifacts.library({identifier=jenkins@main, retriever=null}) promoteArtifacts.readYaml({file=tests/data/opensearch-dashboards-2.0.0-rc1.yml}) - InputManifest.asBoolean() promoteArtifacts.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) promoteArtifacts.string({credentialsId=jenkins-artifact-bucket-name, variable=ARTIFACT_BUCKET_NAME}) promoteArtifacts.string({credentialsId=jenkins-artifact-promotion-role, variable=ARTIFACT_PROMOTION_ROLE_NAME}) diff --git a/tests/jenkins/jobs/PromoteArtifacts_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteArtifacts_Jenkinsfile.txt index 127cdf1bc..839f34117 100644 --- a/tests/jenkins/jobs/PromoteArtifacts_Jenkinsfile.txt +++ b/tests/jenkins/jobs/PromoteArtifacts_Jenkinsfile.txt @@ -4,10 +4,7 @@ PromoteArtifacts_Jenkinsfile.stage(promote, groovy.lang.Closure) PromoteArtifacts_Jenkinsfile.script(groovy.lang.Closure) PromoteArtifacts_Jenkinsfile.promoteArtifacts({manifest=tests/data/opensearch-1.3.0.yml}) - promoteArtifacts.legacySCM(groovy.lang.Closure) - promoteArtifacts.library({identifier=jenkins@main, retriever=null}) promoteArtifacts.readYaml({file=tests/data/opensearch-1.3.0.yml}) - InputManifest.asBoolean() promoteArtifacts.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) promoteArtifacts.string({credentialsId=jenkins-artifact-bucket-name, variable=ARTIFACT_BUCKET_NAME}) promoteArtifacts.string({credentialsId=jenkins-artifact-promotion-role, variable=ARTIFACT_PROMOTION_ROLE_NAME}) diff --git a/tests/jenkins/jobs/PromoteArtifacts_OpenSearch_Dashboards_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteArtifacts_OpenSearch_Dashboards_Jenkinsfile.txt index d93b3182b..96d411b3f 100644 --- a/tests/jenkins/jobs/PromoteArtifacts_OpenSearch_Dashboards_Jenkinsfile.txt +++ b/tests/jenkins/jobs/PromoteArtifacts_OpenSearch_Dashboards_Jenkinsfile.txt @@ -4,10 +4,7 @@ PromoteArtifacts_OpenSearch_Dashboards_Jenkinsfile.stage(promote, groovy.lang.Closure) PromoteArtifacts_OpenSearch_Dashboards_Jenkinsfile.script(groovy.lang.Closure) PromoteArtifacts_OpenSearch_Dashboards_Jenkinsfile.promoteArtifacts({manifest=tests/data/opensearch-dashboards-1.3.0.yml}) - promoteArtifacts.legacySCM(groovy.lang.Closure) - promoteArtifacts.library({identifier=jenkins@main, retriever=null}) promoteArtifacts.readYaml({file=tests/data/opensearch-dashboards-1.3.0.yml}) - InputManifest.asBoolean() promoteArtifacts.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) promoteArtifacts.string({credentialsId=jenkins-artifact-bucket-name, variable=ARTIFACT_BUCKET_NAME}) promoteArtifacts.string({credentialsId=jenkins-artifact-promotion-role, variable=ARTIFACT_PROMOTION_ROLE_NAME}) diff --git a/tests/jenkins/jobs/PromoteArtifacts_actions_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteArtifacts_actions_Jenkinsfile.txt index f48b12c8b..37996ddd0 100644 --- a/tests/jenkins/jobs/PromoteArtifacts_actions_Jenkinsfile.txt +++ b/tests/jenkins/jobs/PromoteArtifacts_actions_Jenkinsfile.txt @@ -5,13 +5,8 @@ PromoteArtifacts_actions_Jenkinsfile.script(groovy.lang.Closure) PromoteArtifacts_actions_Jenkinsfile.createSha512Checksums() PromoteArtifacts_actions_Jenkinsfile.createSignatureFiles() - createSignatureFiles.legacySCM(groovy.lang.Closure) - createSignatureFiles.library({identifier=jenkins@main, retriever=null}) PromoteArtifacts_actions_Jenkinsfile.promoteArtifacts({manifest=tests/data/opensearch-1.3.0.yml, fileActions=[groovy.lang.Closure, groovy.lang.Closure]}) - promoteArtifacts.legacySCM(groovy.lang.Closure) - promoteArtifacts.library({identifier=jenkins@main, retriever=null}) promoteArtifacts.readYaml({file=tests/data/opensearch-1.3.0.yml}) - InputManifest.asBoolean() promoteArtifacts.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) promoteArtifacts.string({credentialsId=jenkins-artifact-bucket-name, variable=ARTIFACT_BUCKET_NAME}) promoteArtifacts.string({credentialsId=jenkins-artifact-promotion-role, variable=ARTIFACT_PROMOTION_ROLE_NAME}) diff --git a/tests/jenkins/jobs/PromoteArtifacts_actions_OpenSearch_Dashboards_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteArtifacts_actions_OpenSearch_Dashboards_Jenkinsfile.txt index c3382aa6b..eca9a0fbd 100644 --- a/tests/jenkins/jobs/PromoteArtifacts_actions_OpenSearch_Dashboards_Jenkinsfile.txt +++ b/tests/jenkins/jobs/PromoteArtifacts_actions_OpenSearch_Dashboards_Jenkinsfile.txt @@ -5,13 +5,8 @@ PromoteArtifacts_actions_OpenSearch_Dashboards_Jenkinsfile.script(groovy.lang.Closure) PromoteArtifacts_actions_OpenSearch_Dashboards_Jenkinsfile.createSha512Checksums() PromoteArtifacts_actions_OpenSearch_Dashboards_Jenkinsfile.createSignatureFiles() - createSignatureFiles.legacySCM(groovy.lang.Closure) - createSignatureFiles.library({identifier=jenkins@main, retriever=null}) PromoteArtifacts_actions_OpenSearch_Dashboards_Jenkinsfile.promoteArtifacts({manifest=tests/data/opensearch-dashboards-1.3.0.yml, fileActions=[groovy.lang.Closure, groovy.lang.Closure]}) - promoteArtifacts.legacySCM(groovy.lang.Closure) - promoteArtifacts.library({identifier=jenkins@main, retriever=null}) promoteArtifacts.readYaml({file=tests/data/opensearch-dashboards-1.3.0.yml}) - InputManifest.asBoolean() promoteArtifacts.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_PUBLIC}) promoteArtifacts.string({credentialsId=jenkins-artifact-bucket-name, variable=ARTIFACT_BUCKET_NAME}) promoteArtifacts.string({credentialsId=jenkins-artifact-promotion-role, variable=ARTIFACT_PROMOTION_ROLE_NAME}) diff --git a/tests/jenkins/jobs/PromoteYumRepos_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteYumRepos_Jenkinsfile.txt index 211f47c0b..db7f0ba4c 100644 --- a/tests/jenkins/jobs/PromoteYumRepos_Jenkinsfile.txt +++ b/tests/jenkins/jobs/PromoteYumRepos_Jenkinsfile.txt @@ -4,10 +4,7 @@ PromoteYumRepos_Jenkinsfile.stage(promote, groovy.lang.Closure) PromoteYumRepos_Jenkinsfile.script(groovy.lang.Closure) PromoteYumRepos_Jenkinsfile.promoteYumRepos({buildNumber=123, jobName=opensearch, manifest=tests/data/opensearch-1.3.0.yml}) - promoteYumRepos.legacySCM(groovy.lang.Closure) - promoteYumRepos.library({identifier=jenkins@main, retriever=null}) promoteYumRepos.readYaml({file=tests/data/opensearch-1.3.0.yml}) - InputManifest.asBoolean() promoteYumRepos.string({credentialsId=jenkins-artifact-promotion-role, variable=ARTIFACT_PROMOTION_ROLE_NAME}) promoteYumRepos.string({credentialsId=jenkins-aws-production-account, variable=AWS_ACCOUNT_ARTIFACT}) promoteYumRepos.string({credentialsId=jenkins-artifact-production-bucket-name, variable=ARTIFACT_PRODUCTION_BUCKET_NAME}) diff --git a/tests/jenkins/jobs/RpmDashboardsDistValidation_Jenkinsfile.txt b/tests/jenkins/jobs/RpmDashboardsDistValidation_Jenkinsfile.txt index 99b632109..20719e2bf 100644 --- a/tests/jenkins/jobs/RpmDashboardsDistValidation_Jenkinsfile.txt +++ b/tests/jenkins/jobs/RpmDashboardsDistValidation_Jenkinsfile.txt @@ -4,10 +4,7 @@ RpmDashboardsDistValidation_Jenkinsfile.stage(validate RPM meta, groovy.lang.Closure) RpmDashboardsDistValidation_Jenkinsfile.script(groovy.lang.Closure) RpmDashboardsDistValidation_Jenkinsfile.rpmDashboardsDistValidation({bundleManifest=tests/data/opensearch-dashboards-1.3.0-x64-rpm.yml, rpmDistribution=/tmp/workspace/opensearch-dashboards-1.3.0-linux-x64.rpm}) - rpmDashboardsDistValidation.legacySCM(groovy.lang.Closure) - rpmDashboardsDistValidation.library({identifier=jenkins@main, retriever=null}) rpmDashboardsDistValidation.readYaml({file=tests/data/opensearch-dashboards-1.3.0-x64-rpm.yml}) - BundleManifest.asBoolean() BundleManifest.getNames() rpmDashboardsDistValidation.rpmMetaValidation({rpmDistribution=/tmp/workspace/opensearch-dashboards-1.3.0-linux-x64.rpm, refMap={Name=opensearch-dashboards, Version=1.3.0, Architecture=x64, Group=Application/Internet, License=Apache-2.0, Relocations=(not relocatable), URL=https://opensearch.org/, Summary=Open source visualization dashboards for OpenSearch, Description=OpenSearch Dashboards is the visualization tool for data in OpenSearch For more information, see: https://opensearch.org/}}) diff --git a/tests/jenkins/jobs/RpmOpenSearchDistValidation_Jenkinsfile.txt b/tests/jenkins/jobs/RpmOpenSearchDistValidation_Jenkinsfile.txt index e90169009..29e451813 100644 --- a/tests/jenkins/jobs/RpmOpenSearchDistValidation_Jenkinsfile.txt +++ b/tests/jenkins/jobs/RpmOpenSearchDistValidation_Jenkinsfile.txt @@ -4,10 +4,7 @@ RpmOpenSearchDistValidation_Jenkinsfile.stage(validate RPM meta, groovy.lang.Closure) RpmOpenSearchDistValidation_Jenkinsfile.script(groovy.lang.Closure) RpmOpenSearchDistValidation_Jenkinsfile.rpmOpenSearchDistValidation({bundleManifest=tests/data/opensearch-1.3.1-x64-rpm.yml, rpmDistribution=/tmp/workspace/opensearch-1.3.1-linux-x64.rpm}) - rpmOpenSearchDistValidation.legacySCM(groovy.lang.Closure) - rpmOpenSearchDistValidation.library({identifier=jenkins@main, retriever=null}) rpmOpenSearchDistValidation.readYaml({file=tests/data/opensearch-1.3.1-x64-rpm.yml}) - BundleManifest.asBoolean() BundleManifest.getNames() rpmOpenSearchDistValidation.rpmMetaValidation({rpmDistribution=/tmp/workspace/opensearch-1.3.1-linux-x64.rpm, refMap={Name=opensearch, Version=1.3.1, Architecture=x64, Group=Application/Internet, License=Apache-2.0, Relocations=(not relocatable), URL=https://opensearch.org/, Summary=An open source distributed and RESTful search engine, Description=OpenSearch makes it easy to ingest, search, visualize, and analyze your data For more information, see: https://opensearch.org/}}) diff --git a/tests/jenkins/jobs/RunBwcTestScript_Jenkinsfile.txt b/tests/jenkins/jobs/RunBwcTestScript_Jenkinsfile.txt index 482338229..28e16ba34 100644 --- a/tests/jenkins/jobs/RunBwcTestScript_Jenkinsfile.txt +++ b/tests/jenkins/jobs/RunBwcTestScript_Jenkinsfile.txt @@ -4,10 +4,7 @@ RunBwcTestScript_Jenkinsfile.stage(bwc-test, groovy.lang.Closure) RunBwcTestScript_Jenkinsfile.script(groovy.lang.Closure) RunBwcTestScript_Jenkinsfile.runBwcTestScript({jobName=dummy_job, buildManifest=tests/data/opensearch-1.3.0-build.yml, testManifest=tests/data/opensearch-1.3.0-test.yml, buildId=717}) - runBwcTestScript.legacySCM(groovy.lang.Closure) - runBwcTestScript.library({identifier=jenkins@main, retriever=null}) runBwcTestScript.readYaml({file=tests/data/opensearch-1.3.0-build.yml}) - BuildManifest.asBoolean() BuildManifest.getArtifactRootUrl(dummy_job, 717) runBwcTestScript.echo(Artifact root URL: https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) runBwcTestScript.echo(Paths: opensearch=https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/717/linux/x64/tar) diff --git a/tests/jenkins/jobs/RunBwcTestScript_OpenSearch_Dashboards_Jenkinsfile.txt b/tests/jenkins/jobs/RunBwcTestScript_OpenSearch_Dashboards_Jenkinsfile.txt index 16fb38ad4..68698e722 100644 --- a/tests/jenkins/jobs/RunBwcTestScript_OpenSearch_Dashboards_Jenkinsfile.txt +++ b/tests/jenkins/jobs/RunBwcTestScript_OpenSearch_Dashboards_Jenkinsfile.txt @@ -4,10 +4,7 @@ RunBwcTestScript_OpenSearch_Dashboards_Jenkinsfile.stage(bwc-test, groovy.lang.Closure) RunBwcTestScript_OpenSearch_Dashboards_Jenkinsfile.script(groovy.lang.Closure) RunBwcTestScript_OpenSearch_Dashboards_Jenkinsfile.runBwcTestScript({jobName=dummy_job, buildManifest=tests/data/opensearch-dashboards-1.2.0-build.yml, testManifest=tests/data/opensearch-dashboards-1.2.0-test.yml, buildId=215}) - runBwcTestScript.legacySCM(groovy.lang.Closure) - runBwcTestScript.library({identifier=jenkins@main, retriever=null}) runBwcTestScript.readYaml({file=tests/data/opensearch-dashboards-1.2.0-build.yml}) - BuildManifest.asBoolean() BuildManifest.getArtifactRootUrl(dummy_job, 215) runBwcTestScript.echo(Artifact root URL: https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) runBwcTestScript.echo(Paths: opensearch-dashboards=https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) diff --git a/tests/jenkins/jobs/RunGradleCheck_Jenkinsfile.txt b/tests/jenkins/jobs/RunGradleCheck_Jenkinsfile.txt index 12e9722ad..874937e77 100644 --- a/tests/jenkins/jobs/RunGradleCheck_Jenkinsfile.txt +++ b/tests/jenkins/jobs/RunGradleCheck_Jenkinsfile.txt @@ -4,8 +4,6 @@ RunGradleCheck_Jenkinsfile.stage(gradle-check, groovy.lang.Closure) RunGradleCheck_Jenkinsfile.script(groovy.lang.Closure) RunGradleCheck_Jenkinsfile.runGradleCheck({gitRepoUrl=https://github.com/opensearch-project/OpenSearch, gitReference=main}) - runGradleCheck.legacySCM(groovy.lang.Closure) - runGradleCheck.library({identifier=jenkins@main, retriever=null}) runGradleCheck.usernamePassword({credentialsId=jenkins-gradle-check-s3-aws-credentials, usernameVariable=amazon_s3_access_key, passwordVariable=amazon_s3_secret_key}) runGradleCheck.usernamePassword({credentialsId=jenkins-gradle-check-s3-aws-resources, usernameVariable=amazon_s3_base_path, passwordVariable=amazon_s3_bucket}) runGradleCheck.withCredentials([[amazon_s3_access_key, amazon_s3_secret_key], [amazon_s3_base_path, amazon_s3_bucket]], groovy.lang.Closure) diff --git a/tests/jenkins/jobs/RunIntegTestScript_Jenkinsfile.txt b/tests/jenkins/jobs/RunIntegTestScript_Jenkinsfile.txt index cfc7eaab2..02c7e48de 100644 --- a/tests/jenkins/jobs/RunIntegTestScript_Jenkinsfile.txt +++ b/tests/jenkins/jobs/RunIntegTestScript_Jenkinsfile.txt @@ -4,10 +4,7 @@ RunIntegTestScript_Jenkinsfile.stage(integ-test, groovy.lang.Closure) RunIntegTestScript_Jenkinsfile.script(groovy.lang.Closure) RunIntegTestScript_Jenkinsfile.runIntegTestScript({jobName=dummy_job, componentName=OpenSearch, buildManifest=tests/data/opensearch-1.3.0-build.yml, testManifest=tests/data/opensearch-1.3.0-test.yml}) - runIntegTestScript.legacySCM(groovy.lang.Closure) - runIntegTestScript.library({identifier=jenkins@main, retriever=null}) runIntegTestScript.readYaml({file=tests/data/opensearch-1.3.0-build.yml}) - BuildManifest.asBoolean() runIntegTestScript.echo(Build Id: c3ff7a232d25403fa8cc14c97799c323) BuildManifest.getArtifactRootUrl(dummy_job, c3ff7a232d25403fa8cc14c97799c323) runIntegTestScript.echo(Artifact root URL: https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/c3ff7a232d25403fa8cc14c97799c323/linux/x64/tar) diff --git a/tests/jenkins/jobs/RunIntegTestScript_LocalPath_Jenkinsfile.txt b/tests/jenkins/jobs/RunIntegTestScript_LocalPath_Jenkinsfile.txt index 22db480fc..f43b721eb 100644 --- a/tests/jenkins/jobs/RunIntegTestScript_LocalPath_Jenkinsfile.txt +++ b/tests/jenkins/jobs/RunIntegTestScript_LocalPath_Jenkinsfile.txt @@ -4,10 +4,7 @@ RunIntegTestScript_LocalPath_Jenkinsfile.stage(integ-test, groovy.lang.Closure) RunIntegTestScript_LocalPath_Jenkinsfile.script(groovy.lang.Closure) RunIntegTestScript_LocalPath_Jenkinsfile.runIntegTestScript({jobName=dummy_job, componentName=OpenSearch, buildManifest=tests/data/opensearch-1.3.0-build.yml, testManifest=tests/data/opensearch-1.3.0-test.yml, localPath=tests/jenkins/artifacts/tar}) - runIntegTestScript.legacySCM(groovy.lang.Closure) - runIntegTestScript.library({identifier=jenkins@main, retriever=null}) runIntegTestScript.readYaml({file=tests/data/opensearch-1.3.0-build.yml}) - BuildManifest.asBoolean() runIntegTestScript.echo(Build Id: c3ff7a232d25403fa8cc14c97799c323) BuildManifest.getArtifactRootUrl(dummy_job, c3ff7a232d25403fa8cc14c97799c323) runIntegTestScript.echo(Artifact root URL: https://ci.opensearch.org/ci/dbc/dummy_job/1.3.0/c3ff7a232d25403fa8cc14c97799c323/linux/x64/tar) diff --git a/tests/jenkins/jobs/RunIntegTestScript_OpenSearch_Dashboards_Jenkinsfile.txt b/tests/jenkins/jobs/RunIntegTestScript_OpenSearch_Dashboards_Jenkinsfile.txt index 96d2b6fa8..2fb827976 100644 --- a/tests/jenkins/jobs/RunIntegTestScript_OpenSearch_Dashboards_Jenkinsfile.txt +++ b/tests/jenkins/jobs/RunIntegTestScript_OpenSearch_Dashboards_Jenkinsfile.txt @@ -4,10 +4,7 @@ RunIntegTestScript_OpenSearch_Dashboards_Jenkinsfile.stage(integ-test, groovy.lang.Closure) RunIntegTestScript_OpenSearch_Dashboards_Jenkinsfile.script(groovy.lang.Closure) RunIntegTestScript_OpenSearch_Dashboards_Jenkinsfile.runIntegTestScript({jobName=dummy_job, componentName=functionalTestDashboards, buildManifest=tests/data/opensearch-dashboards-1.2.0-build.yml, testManifest=tests/data/opensearch-dashboards-1.2.0-test.yml}) - runIntegTestScript.legacySCM(groovy.lang.Closure) - runIntegTestScript.library({identifier=jenkins@main, retriever=null}) runIntegTestScript.readYaml({file=tests/data/opensearch-dashboards-1.2.0-build.yml}) - BuildManifest.asBoolean() runIntegTestScript.echo(Build Id: 215) BuildManifest.getArtifactRootUrl(dummy_job, 215) runIntegTestScript.echo(Artifact root URL: https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) diff --git a/tests/jenkins/jobs/UploadTestResults_Jenkinsfile.txt b/tests/jenkins/jobs/UploadTestResults_Jenkinsfile.txt index 2fcc9a00d..3c15ea01b 100644 --- a/tests/jenkins/jobs/UploadTestResults_Jenkinsfile.txt +++ b/tests/jenkins/jobs/UploadTestResults_Jenkinsfile.txt @@ -4,10 +4,7 @@ UploadTestResults_Jenkinsfile.stage(sign, groovy.lang.Closure) UploadTestResults_Jenkinsfile.script(groovy.lang.Closure) UploadTestResults_Jenkinsfile.uploadTestResults({buildManifestFileName=tests/data/opensearch-1.3.0-build.yml, jobName=dummy_job}) - uploadTestResults.legacySCM(groovy.lang.Closure) - uploadTestResults.library({identifier=jenkins@main, retriever=null}) uploadTestResults.readYaml({file=tests/data/opensearch-1.3.0-build.yml}) - BuildManifest.asBoolean() uploadTestResults.echo(Build Id: c3ff7a232d25403fa8cc14c97799c323) BuildManifest.getArtifactRoot(dummy_job, c3ff7a232d25403fa8cc14c97799c323) uploadTestResults.string({credentialsId=jenkins-artifact-bucket-name, variable=ARTIFACT_BUCKET_NAME}) @@ -17,7 +14,6 @@ uploadTestResults.withAWS({role=opensearch-test, roleAccount=AWS_ACCOUNT_PUBLIC, duration=900, roleSessionName=jenkins-session}, groovy.lang.Closure) uploadTestResults.s3Upload({file=test-results, bucket=ARTIFACT_BUCKET_NAME, path=dummy_job/1.3.0/c3ff7a232d25403fa8cc14c97799c323/linux/x64/tar/test-results}) BuildManifest.getArtifactRootUrl(DUMMY_PUBLIC_ARTIFACT_URL, dummy_job) - Messages.asBoolean() Messages.add(DUMMY_STAGE_NAME, https://ci.opensearch.org/ci/dbc/DUMMY_PUBLIC_ARTIFACT_URL/1.3.0/dummy_job/linux/x64/tar/test-results/) uploadTestResults.writeFile({file=messages/DUMMY_STAGE_NAME.msg, text=https://ci.opensearch.org/ci/dbc/DUMMY_PUBLIC_ARTIFACT_URL/1.3.0/dummy_job/linux/x64/tar/test-results/}) uploadTestResults.stash({includes=messages/*, name=messages-DUMMY_STAGE_NAME}) diff --git a/tests/jenkins/jobs/uploadMinSnapshotsToS3_Jenkinsfile.txt b/tests/jenkins/jobs/uploadMinSnapshotsToS3_Jenkinsfile.txt index f99042409..4d18f2b66 100644 --- a/tests/jenkins/jobs/uploadMinSnapshotsToS3_Jenkinsfile.txt +++ b/tests/jenkins/jobs/uploadMinSnapshotsToS3_Jenkinsfile.txt @@ -5,13 +5,9 @@ uploadMinSnapshotsToS3_Jenkinsfile.script(groovy.lang.Closure) uploadMinSnapshotsToS3_Jenkinsfile.createSha512Checksums() uploadMinSnapshotsToS3_Jenkinsfile.uploadMinSnapshotsToS3({fileActions=[groovy.lang.Closure], manifest=tests/data/opensearch-1.3.0-build.yml, distribution=tar}) - uploadMinSnapshotsToS3.legacySCM(groovy.lang.Closure) - uploadMinSnapshotsToS3.library({identifier=jenkins@main, retriever=null}) uploadMinSnapshotsToS3.readYaml({file=tests/data/opensearch-1.3.0-build.yml}) - InputManifest.asBoolean() uploadMinSnapshotsToS3.echo(Retreving build manifest from: tests/data/tar/builds/opensearch/manifest.yml) uploadMinSnapshotsToS3.readYaml({file=tests/data/tar/builds/opensearch/manifest.yml}) - BuildManifest.asBoolean() uploadMinSnapshotsToS3.echo(Create .sha512 for Min Snapshots Artifacts) createSha512Checksums.sh({script=find tests/data/tar/builds/opensearch/dist -type f, returnStdout=true}) createSha512Checksums.echo(Creating sha for opensearch-min-1.3.0-linux-x64.tar.gz) diff --git a/tests/jenkins/lib-testers/RunPerfTestScriptLibTest.groovy b/tests/jenkins/lib-testers/RunPerfTestScriptLibTest.groovy index 5ec162592..7a3a46c1c 100644 --- a/tests/jenkins/lib-testers/RunPerfTestScriptLibTest.groovy +++ b/tests/jenkins/lib-testers/RunPerfTestScriptLibTest.groovy @@ -8,6 +8,7 @@ */ import static org.hamcrest.CoreMatchers.notNullValue import static org.hamcrest.MatcherAssert.assertThat +import jenkins.BuildManifest class RunPerfTestScriptLibTester extends LibFunctionTester { @@ -43,7 +44,7 @@ class RunPerfTestScriptLibTester extends LibFunctionTester { helper.registerAllowedMethod('findFiles', [Map.class], null) helper.registerAllowedMethod("withCredentials", [Map]) helper.registerAllowedMethod("downloadBuildManifest", [Map], { - c -> lib.jenkins.BuildManifest.new(readYaml(file: bundleManifest)) + c -> new BuildManifest(readYaml(file: bundleManifest)) }) helper.registerAllowedMethod('parameterizedCron', [String], null) binding.setVariable('AGENT_LABEL', 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host') diff --git a/vars/archiveAssembleUpload.groovy b/vars/archiveAssembleUpload.groovy index 5c5a88e7f..5416e9994 100644 --- a/vars/archiveAssembleUpload.groovy +++ b/vars/archiveAssembleUpload.groovy @@ -6,9 +6,11 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ +import jenkins.BuildManifest +import jenkins.InputManifest + def call(Map args = [:]) { - lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) - def inputManifestObj = lib.jenkins.InputManifest.new(readYaml(file: args.inputManifest)) + def inputManifestObj = new InputManifest(readYaml(file: args.inputManifest)) String stashName = "${args.stashName}" echo "Unstashing ${stashName} before starting the assemble process" @@ -17,7 +19,7 @@ def call(Map args = [:]) { echo "Assembling ${args.inputManifest}" String buildManifest = "${args.distribution}/builds/${inputManifestObj.build.getFilename()}/manifest.yml" - def buildManifestObj = lib.jenkins.BuildManifest.new(readYaml(file: buildManifest)) + def buildManifestObj = new BuildManifest(readYaml(file: buildManifest)) assembleUpload( args + [ diff --git a/vars/assembleManifest.groovy b/vars/assembleManifest.groovy index 585c5c3e7..e75217c33 100644 --- a/vars/assembleManifest.groovy +++ b/vars/assembleManifest.groovy @@ -6,9 +6,11 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ + +import jenkins.BuildManifest + void call(Map args = [:]) { - lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) - def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.buildManifest)) + def buildManifest = new BuildManifest(readYaml(file: args.buildManifest)) def filename = buildManifest.build.getFilename() def baseUrl = buildManifest.getArtifactRootUrlWithoutDistribution("${PUBLIC_ARTIFACT_URL}", "${JOB_NAME}", "${BUILD_NUMBER}") sh([ diff --git a/vars/assembleUpload.groovy b/vars/assembleUpload.groovy index 88f13ad31..9978d8b13 100644 --- a/vars/assembleUpload.groovy +++ b/vars/assembleUpload.groovy @@ -6,10 +6,9 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -void call(Map args = [:]) { - - lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) +void call(Map args = [:]) { + lib = library(identifier: 'jenkins', retriever: legacySCM(scm)) assembleManifest(args) uploadArtifacts(args) } diff --git a/vars/buildArchive.groovy b/vars/buildArchive.groovy index 3eba4aded..30f92994e 100644 --- a/vars/buildArchive.groovy +++ b/vars/buildArchive.groovy @@ -6,14 +6,16 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ + +import jenkins.Messages + void call(Map args = [:]) { - def lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) buildManifest(args) String stashName = "${args.stashName}" echo "Stashing builds to assemble later with name: ${stashName}" stash includes: "${args.distribution}/builds/**", name: "${stashName}" - lib.jenkins.Messages.new(this).add("${STAGE_NAME}", "Built ${STAGE_NAME}.") + new Messages(this).add("${STAGE_NAME}", "Built ${STAGE_NAME}.") } diff --git a/vars/buildAssembleUpload.groovy b/vars/buildAssembleUpload.groovy index 1019ae501..c86dc18f2 100644 --- a/vars/buildAssembleUpload.groovy +++ b/vars/buildAssembleUpload.groovy @@ -6,14 +6,16 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ +import jenkins.BuildManifest +import jenkins.InputManifest + def call(Map args = [:]) { - def lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) - def inputManifestObj = lib.jenkins.InputManifest.new(readYaml(file: args.inputManifest)) + def inputManifestObj = new InputManifest(readYaml(file: args.inputManifest)) buildManifest(args) String buildManifest = "${args.distribution}/builds/${inputManifestObj.build.getFilename()}/manifest.yml" - def buildManifestObj = lib.jenkins.BuildManifest.new(readYaml(file: buildManifest)) + def buildManifestObj = new BuildManifest(readYaml(file: buildManifest)) assembleUpload( args + [ diff --git a/vars/buildDockerImage.groovy b/vars/buildDockerImage.groovy index 68b2571e3..1c7e429db 100644 --- a/vars/buildDockerImage.groovy +++ b/vars/buildDockerImage.groovy @@ -6,9 +6,11 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ + +import jenkins.InputManifest + void call(Map args = [:]) { - def lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) - def inputManifest = lib.jenkins.InputManifest.new(readYaml(file: args.inputManifest)) + def inputManifest = new InputManifest(readYaml(file: args.inputManifest)) def build_qualifier = inputManifest.build.qualifier def build_number = args.buildNumber ?: "${BUILD_NUMBER}" diff --git a/vars/buildUploadManifestSHA.groovy b/vars/buildUploadManifestSHA.groovy index 2b1ddee11..fbd418973 100644 --- a/vars/buildUploadManifestSHA.groovy +++ b/vars/buildUploadManifestSHA.groovy @@ -7,8 +7,6 @@ * compatible open source license. */ void call(Map args = [:]) { - lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) - def sha = getManifestSHA(args) withCredentials([ diff --git a/vars/buildYumRepo.groovy b/vars/buildYumRepo.groovy index bb6ced915..26beb0967 100644 --- a/vars/buildYumRepo.groovy +++ b/vars/buildYumRepo.groovy @@ -6,10 +6,10 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ +import jenkins.BuildManifest void call(Map args = [:]) { - lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) - def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.buildManifest)) + def buildManifest = new BuildManifest(readYaml(file: args.buildManifest)) echo "Create yum repo metadata and repo file ${args.buildManifest}" def filename = buildManifest.build.getFilename() diff --git a/vars/createReleaseTag.groovy b/vars/createReleaseTag.groovy index d0f893c8c..1dc869259 100644 --- a/vars/createReleaseTag.groovy +++ b/vars/createReleaseTag.groovy @@ -6,10 +6,11 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ +import jenkins.BundleManifest + def call(Map args = [:]) { - def lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) - def bundleManifestObj = lib.jenkins.BundleManifest.new(readYaml(file: args.distManifest)) + def bundleManifestObj = new BundleManifest(readYaml(file: args.distManifest)) def componentsName = bundleManifestObj.getNames() def componetsNumber = componentsName.size() diff --git a/vars/createSignatureFiles.groovy b/vars/createSignatureFiles.groovy index 72cda7b7f..e0c6454c3 100644 --- a/vars/createSignatureFiles.groovy +++ b/vars/createSignatureFiles.groovy @@ -7,9 +7,7 @@ * compatible open source license. */ Closure call() { - - lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) - + return { args -> signArtifacts(args) } } diff --git a/vars/detectDockerAgent.groovy b/vars/detectDockerAgent.groovy index cfa74aac6..7971464ea 100644 --- a/vars/detectDockerAgent.groovy +++ b/vars/detectDockerAgent.groovy @@ -6,10 +6,11 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ +import jenkins.InputManifest + Map call(Map args = [:]) { - def lib = library(identifier: "jenkins@main", retriever: legacySCM(scm)) String manifest = args.manifest ?: "manifests/${INPUT_MANIFEST}" - def inputManifest = lib.jenkins.InputManifest.new(readYaml(file: manifest)) + def inputManifest = new InputManifest(readYaml(file: manifest)) dockerImage = inputManifest.ci?.image?.name ?: 'opensearchstaging/ci-runner:ci-runner-centos7-v1' dockerArgs = inputManifest.ci?.image?.args // Using default javaVersion as openjdk-17 diff --git a/vars/detectTestDockerAgent.groovy b/vars/detectTestDockerAgent.groovy index acc9c8819..0e5aa1c15 100644 --- a/vars/detectTestDockerAgent.groovy +++ b/vars/detectTestDockerAgent.groovy @@ -6,10 +6,11 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ +import jenkins.TestManifest + Map call(Map args = [:]) { - def lib = library(identifier: "jenkins@main", retriever: legacySCM(scm)) String manifest = args.testManifest ?: "manifests/${TEST_MANIFEST}" - def testManifest = lib.jenkins.TestManifest.new(readYaml(file: manifest)) + def testManifest = new TestManifest(readYaml(file: manifest)) dockerImage = testManifest.ci?.image?.name ?: 'opensearchstaging/ci-runner:ci-runner-centos7-v1' dockerArgs = testManifest.ci?.image?.args echo "Using Docker image ${dockerImage} (${dockerArgs})" diff --git a/vars/downloadBuildManifest.groovy b/vars/downloadBuildManifest.groovy index d0d21b974..bc3134715 100644 --- a/vars/downloadBuildManifest.groovy +++ b/vars/downloadBuildManifest.groovy @@ -6,10 +6,10 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -def call(Map args = [:]) { - def lib = library(identifier: "jenkins@main", retriever: legacySCM(scm)) +import jenkins.BuildManifest +def call(Map args = [:]) { sh "curl -sSL ${args.url} --output ${args.path}" - def buildManifestObj = lib.jenkins.BuildManifest.new(readYaml(file: args.path)) + def buildManifestObj = new BuildManifest(readYaml(file: args.path)) return buildManifestObj } diff --git a/vars/getManifestSHA.groovy b/vars/getManifestSHA.groovy index 76ede00df..82fec039e 100644 --- a/vars/getManifestSHA.groovy +++ b/vars/getManifestSHA.groovy @@ -6,6 +6,8 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ +import jenkins.InputManifest + Map call(Map args = [:]) { String inputManifest = args.inputManifest ?: "manifests/${INPUT_MANIFEST}" String jobName = args.jobName ?: "${JOB_NAME}" @@ -21,8 +23,7 @@ Map call(Map args = [:]) { String manifestSHA = sha1(manifestLock) echo "Manifest SHA: ${manifestSHA}" - def lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) - def inputManifestObj = lib.jenkins.InputManifest.new(readYaml(file: manifestLock)) + def inputManifestObj = new InputManifest(readYaml(file: manifestLock)) String shasRoot = inputManifestObj.getSHAsRoot(jobName) String manifestSHAPath = "${shasRoot}/${manifestSHA}.yml" echo "Manifest lock: ${manifestLock}" diff --git a/vars/promoteArtifacts.groovy b/vars/promoteArtifacts.groovy index 886993e46..d5b32b17a 100644 --- a/vars/promoteArtifacts.groovy +++ b/vars/promoteArtifacts.groovy @@ -6,15 +6,14 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ +import jenkins.InputManifest void call(Map args = [:]) { - def lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) - // fileActions are a closure that accepts a String, filepath with return type void List fileActions = args.fileActions ?: [] String manifest = args.manifest ?: "manifests/${INPUT_MANIFEST}" - def inputManifest = lib.jenkins.InputManifest.new(readYaml(file: manifest)) + def inputManifest = new InputManifest(readYaml(file: manifest)) String filename = inputManifest.build.getFilename() String version = inputManifest.build.version String qualifier = inputManifest.build.qualifier ? '-' + inputManifest.build.qualifier : '' diff --git a/vars/promoteYumRepos.groovy b/vars/promoteYumRepos.groovy index b79bb4f8a..8caaa17cf 100644 --- a/vars/promoteYumRepos.groovy +++ b/vars/promoteYumRepos.groovy @@ -6,12 +6,12 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ +import jenkins.InputManifest void call(Map args = [:]) { - def lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) String manifest = args.manifest ?: "manifests/${INPUT_MANIFEST}" - def inputManifest = lib.jenkins.InputManifest.new(readYaml(file: manifest)) + def inputManifest = new InputManifest(readYaml(file: manifest)) String filename = inputManifest.build.getFilename() String jobname = args.jobName diff --git a/vars/rpmDashboardsDistValidation.groovy b/vars/rpmDashboardsDistValidation.groovy index 73c8f7de5..bb797080d 100644 --- a/vars/rpmDashboardsDistValidation.groovy +++ b/vars/rpmDashboardsDistValidation.groovy @@ -12,10 +12,10 @@ * args.bundleManifest: The location of the distribution manifest. * args.rpmDistribution: The location of the RPM distribution file. */ -def call(Map args = [:]) { +import jenkins.BundleManifest - def lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) - def BundleManifestObj = lib.jenkins.BundleManifest.new(readYaml(file: args.bundleManifest)) +def call(Map args = [:]) { + def BundleManifestObj = new BundleManifest(readYaml(file: args.bundleManifest)) def distFile = args.rpmDistribution def name = BundleManifestObj.build.getFilename() //opensearch-dashboards def version = BundleManifestObj.build.version //2.0.0-rc1 diff --git a/vars/rpmDistValidation.groovy b/vars/rpmDistValidation.groovy index 30f1bfc54..d5fc02274 100644 --- a/vars/rpmDistValidation.groovy +++ b/vars/rpmDistValidation.groovy @@ -11,14 +11,14 @@ * @param Map args = [:] * args.bundleManifestURL: The CI URL of the distribution manifest. */ -def call(Map args = [:]) { +import jenkins.BundleManifest - def lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) +def call(Map args = [:]) { def bundleManifestURL = args.bundleManifestURL sh ("curl -sL $bundleManifestURL -o $WORKSPACE/manifest.yml") def bundleManifest = "$WORKSPACE/manifest.yml" - def BundleManifestObj = lib.jenkins.BundleManifest.new(readYaml(file: "$bundleManifest")) + def BundleManifestObj = new BundleManifest(readYaml(file: "$bundleManifest")) def name = BundleManifestObj.build.getFilename() //opensearch; opensearch-dashboards def version = BundleManifestObj.build.version //2.0.0-rc1 def rpmVersion = version.replace("-", ".") //2.0.0.rc1 diff --git a/vars/rpmOpenSearchDistValidation.groovy b/vars/rpmOpenSearchDistValidation.groovy index 9250fed2d..9bd7367e6 100644 --- a/vars/rpmOpenSearchDistValidation.groovy +++ b/vars/rpmOpenSearchDistValidation.groovy @@ -12,10 +12,11 @@ * args.bundleManifest: The location of the distribution manifest. * args.rpmDistribution: The location of the RPM distribution file. */ +import jenkins.BundleManifest + def call(Map args = [:]) { - def lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) - def BundleManifestObj = lib.jenkins.BundleManifest.new(readYaml(file: args.bundleManifest)) + def BundleManifestObj = new BundleManifest(readYaml(file: args.bundleManifest)) def distFile = args.rpmDistribution def name = BundleManifestObj.build.getFilename() //opensearch def version = BundleManifestObj.build.version //2.0.0-rc1 diff --git a/vars/runBwcTestScript.groovy b/vars/runBwcTestScript.groovy index c8d958d96..a8dc50855 100644 --- a/vars/runBwcTestScript.groovy +++ b/vars/runBwcTestScript.groovy @@ -6,10 +6,11 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ +import jenkins.BuildManifest + void call(Map args = [:]) { String jobName = args.jobName ?: 'distribution-build-opensearch' - lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) - def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.buildManifest)) + def buildManifest = new BuildManifest(readYaml(file: args.buildManifest)) String artifactRootUrl = buildManifest.getArtifactRootUrl(jobName, args.buildId) echo "Artifact root URL: ${artifactRootUrl}" diff --git a/vars/runGradleCheck.groovy b/vars/runGradleCheck.groovy index df95adab2..ed53dc1a8 100644 --- a/vars/runGradleCheck.groovy +++ b/vars/runGradleCheck.groovy @@ -7,7 +7,6 @@ * compatible open source license. */ void call(Map args = [:]) { - def lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) def git_repo_url = args.gitRepoUrl ?: 'null' def git_reference = args.gitReference ?: 'null' diff --git a/vars/runIntegTestScript.groovy b/vars/runIntegTestScript.groovy index 398bf6ab6..123542216 100644 --- a/vars/runIntegTestScript.groovy +++ b/vars/runIntegTestScript.groovy @@ -6,11 +6,12 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ +import jenkins.BuildManifest + void call(Map args = [:]) { - lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) String jobName = args.jobName ?: 'distribution-build-opensearch' - def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.buildManifest)) + def buildManifest = new BuildManifest(readYaml(file: args.buildManifest)) String buildId = buildManifest.build.id echo "Build Id: ${buildId}" diff --git a/vars/runPerfTestScript.groovy b/vars/runPerfTestScript.groovy index 4c78e01e1..d1ebd6d0f 100644 --- a/vars/runPerfTestScript.groovy +++ b/vars/runPerfTestScript.groovy @@ -6,9 +6,10 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ +import jenkins.BuildManifest + void call(Map args = [:]) { - lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) - def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.bundleManifest)) + def buildManifest = new BuildManifest(readYaml(file: args.bundleManifest)) install_opensearch_infra_dependencies() config_name = isNullOrEmpty(args.config) ? "config.yml" : args.config diff --git a/vars/uploadArtifacts.groovy b/vars/uploadArtifacts.groovy index 61e446352..7c294a015 100644 --- a/vars/uploadArtifacts.groovy +++ b/vars/uploadArtifacts.groovy @@ -6,10 +6,13 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ +import jenkins.BuildManifest +import jenkins.Messages + + void call(Map args = [:]) { - def lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) - def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.buildManifest)) + def buildManifest = new BuildManifest(readYaml(file: args.buildManifest)) def minArtifactPath = buildManifest.getMinArtifact() def productFilename = buildManifest.build.getFilename() def packageName = buildManifest.build.getPackageName() @@ -45,7 +48,7 @@ void call(Map args = [:]) { } def baseUrl = buildManifest.getArtifactRootUrl("${PUBLIC_ARTIFACT_URL}", "${JOB_NAME}", "${BUILD_NUMBER}") - lib.jenkins.Messages.new(this).add("${STAGE_NAME}", [ + new Messages(this).add("${STAGE_NAME}", [ "${baseUrl}/builds/${productFilename}/manifest.yml", "${baseUrl}/dist/${productFilename}/manifest.yml" ].join('\n') diff --git a/vars/uploadMinSnapshotsToS3.groovy b/vars/uploadMinSnapshotsToS3.groovy index 53d83d2ef..6c677f840 100644 --- a/vars/uploadMinSnapshotsToS3.groovy +++ b/vars/uploadMinSnapshotsToS3.groovy @@ -6,16 +6,18 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ +import jenkins.BuildManifest +import jenkins.InputManifest + void call(Map args = [:]) { - def lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) List fileActions = args.fileActions ?: [] String manifest = args.manifest ?: "manifests/${INPUT_MANIFEST}" - def inputManifest = lib.jenkins.InputManifest.new(readYaml(file: manifest)) + def inputManifest = new InputManifest(readYaml(file: manifest)) echo("Retreving build manifest from: $WORKSPACE/${args.distribution}/builds/${inputManifest.build.getFilename()}/manifest.yml") productName = inputManifest.build.getFilename() - def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: "$WORKSPACE/${args.distribution}/builds/${productName}/manifest.yml")) + def buildManifest = new BuildManifest(readYaml(file: "$WORKSPACE/${args.distribution}/builds/${productName}/manifest.yml")) version = buildManifest.build.version architecture = buildManifest.build.architecture platform = buildManifest.build.platform diff --git a/vars/uploadTestResults.groovy b/vars/uploadTestResults.groovy index 281d2565e..d762bf746 100644 --- a/vars/uploadTestResults.groovy +++ b/vars/uploadTestResults.groovy @@ -6,10 +6,11 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -void call(Map args = [:]) { - def lib = library(identifier: 'jenkins@main', retriever: legacySCM(scm)) +import jenkins.BuildManifest +import jenkins.Messages - def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.buildManifestFileName)) +void call(Map args = [:]) { + def buildManifest = new BuildManifest(readYaml(file: args.buildManifestFileName)) String buildId = buildManifest.build.id echo "Build Id: ${buildId}" @@ -30,5 +31,5 @@ void call(Map args = [:]) { } def baseUrl = buildManifest.getArtifactRootUrl("${PUBLIC_ARTIFACT_URL}", args.jobName) - lib.jenkins.Messages.new(this).add("${STAGE_NAME}", "${baseUrl}/test-results/") + new Messages(this).add("${STAGE_NAME}", "${baseUrl}/test-results/") }