From 1230d354d5b661974e24ec6d203f0ad4becf19b3 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Sat, 5 Nov 2022 05:17:45 +0000 Subject: [PATCH] upgrade to 1.1.1 with changes in #28 Signed-off-by: Peter Zhu --- vars/archiveAssembleUpload.groovy | 2 +- vars/assembleManifest.groovy | 2 +- vars/assembleUpload.groovy | 2 +- vars/buildArchive.groovy | 2 +- vars/buildAssembleUpload.groovy | 2 +- vars/buildDockerImage.groovy | 2 +- vars/buildUploadManifestSHA.groovy | 2 +- vars/buildYumRepo.groovy | 2 +- vars/createReleaseTag.groovy | 2 +- vars/createSignatureFiles.groovy | 2 +- vars/detectDockerAgent.groovy | 2 +- vars/detectTestDockerAgent.groovy | 2 +- vars/downloadBuildManifest.groovy | 2 +- vars/getManifestSHA.groovy | 2 +- vars/promoteArtifacts.groovy | 2 +- vars/promoteYumRepos.groovy | 2 +- vars/rpmDashboardsDistValidation.groovy | 2 +- vars/rpmDistValidation.groovy | 2 +- vars/rpmOpenSearchDistValidation.groovy | 2 +- vars/runBwcTestScript.groovy | 2 +- vars/runGradleCheck.groovy | 2 +- vars/runIntegTestScript.groovy | 2 +- vars/runPerfTestScript.groovy | 2 +- vars/uploadArtifacts.groovy | 2 +- vars/uploadMinSnapshotsToS3.groovy | 2 +- vars/uploadTestResults.groovy | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/vars/archiveAssembleUpload.groovy b/vars/archiveAssembleUpload.groovy index 2471b4e44..a8432797d 100644 --- a/vars/archiveAssembleUpload.groovy +++ b/vars/archiveAssembleUpload.groovy @@ -7,7 +7,7 @@ * compatible open source license. */ def call(Map args = [:]) { - lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) def inputManifestObj = lib.jenkins.InputManifest.new(readYaml(file: args.inputManifest)) String stashName = "${args.stashName}" diff --git a/vars/assembleManifest.groovy b/vars/assembleManifest.groovy index 51b283fe2..65ed584cd 100644 --- a/vars/assembleManifest.groovy +++ b/vars/assembleManifest.groovy @@ -7,7 +7,7 @@ * compatible open source license. */ void call(Map args = [:]) { - lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.buildManifest)) def filename = buildManifest.build.getFilename() def baseUrl = buildManifest.getArtifactRootUrlWithoutDistribution("${PUBLIC_ARTIFACT_URL}", "${JOB_NAME}", "${BUILD_NUMBER}") diff --git a/vars/assembleUpload.groovy b/vars/assembleUpload.groovy index 5d4ec0af4..a6177a052 100644 --- a/vars/assembleUpload.groovy +++ b/vars/assembleUpload.groovy @@ -8,7 +8,7 @@ */ void call(Map args = [:]) { - lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) assembleManifest(args) uploadArtifacts(args) diff --git a/vars/buildArchive.groovy b/vars/buildArchive.groovy index 5a04e0bc8..bc234c3dd 100644 --- a/vars/buildArchive.groovy +++ b/vars/buildArchive.groovy @@ -7,7 +7,7 @@ * compatible open source license. */ void call(Map args = [:]) { - def lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + def lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) buildManifest(args) String stashName = "${args.stashName}" diff --git a/vars/buildAssembleUpload.groovy b/vars/buildAssembleUpload.groovy index 65d845e3e..9bdd05302 100644 --- a/vars/buildAssembleUpload.groovy +++ b/vars/buildAssembleUpload.groovy @@ -7,7 +7,7 @@ * compatible open source license. */ def call(Map args = [:]) { - def lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + def lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) def inputManifestObj = lib.jenkins.InputManifest.new(readYaml(file: args.inputManifest)) buildManifest(args) diff --git a/vars/buildDockerImage.groovy b/vars/buildDockerImage.groovy index 476884ea8..4b61c596c 100644 --- a/vars/buildDockerImage.groovy +++ b/vars/buildDockerImage.groovy @@ -7,7 +7,7 @@ * compatible open source license. */ void call(Map args = [:]) { - def lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + def lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) def inputManifest = lib.jenkins.InputManifest.new(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 67f48c5c0..d9d1e80a7 100644 --- a/vars/buildUploadManifestSHA.groovy +++ b/vars/buildUploadManifestSHA.groovy @@ -7,7 +7,7 @@ * compatible open source license. */ void call(Map args = [:]) { - lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) def sha = getManifestSHA(args) diff --git a/vars/buildYumRepo.groovy b/vars/buildYumRepo.groovy index c62b9c1a7..5979fca54 100644 --- a/vars/buildYumRepo.groovy +++ b/vars/buildYumRepo.groovy @@ -7,7 +7,7 @@ * compatible open source license. */ void call(Map args = [:]) { - lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.buildManifest)) echo "Create yum repo metadata and repo file ${args.buildManifest}" diff --git a/vars/createReleaseTag.groovy b/vars/createReleaseTag.groovy index 163a0ae6c..a9d6d331a 100644 --- a/vars/createReleaseTag.groovy +++ b/vars/createReleaseTag.groovy @@ -8,7 +8,7 @@ */ def call(Map args = [:]) { - def lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + def lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) def bundleManifestObj = lib.jenkins.BundleManifest.new(readYaml(file: args.distManifest)) def componentsName = bundleManifestObj.getNames() diff --git a/vars/createSignatureFiles.groovy b/vars/createSignatureFiles.groovy index 8f92e7ee2..2b95b099b 100644 --- a/vars/createSignatureFiles.groovy +++ b/vars/createSignatureFiles.groovy @@ -8,7 +8,7 @@ */ Closure call() { - lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) return { args -> signArtifacts(args) } diff --git a/vars/detectDockerAgent.groovy b/vars/detectDockerAgent.groovy index c0abffa80..df0e6f317 100644 --- a/vars/detectDockerAgent.groovy +++ b/vars/detectDockerAgent.groovy @@ -7,7 +7,7 @@ * compatible open source license. */ Map call(Map args = [:]) { - def lib = library(identifier: "jenkins@1.1.1", retriever: legacySCM(scm)) + def lib = library(identifier: "jenkins@1.1.2", retriever: legacySCM(scm)) String manifest = args.manifest ?: "manifests/${INPUT_MANIFEST}" def inputManifest = lib.jenkins.InputManifest.new(readYaml(file: manifest)) dockerImage = inputManifest.ci?.image?.name ?: 'opensearchstaging/ci-runner:ci-runner-centos7-v1' diff --git a/vars/detectTestDockerAgent.groovy b/vars/detectTestDockerAgent.groovy index 3556d0a83..3c87080ad 100644 --- a/vars/detectTestDockerAgent.groovy +++ b/vars/detectTestDockerAgent.groovy @@ -7,7 +7,7 @@ * compatible open source license. */ Map call(Map args = [:]) { - def lib = library(identifier: "jenkins@1.1.1", retriever: legacySCM(scm)) + def lib = library(identifier: "jenkins@1.1.2", retriever: legacySCM(scm)) String manifest = args.testManifest ?: "manifests/${TEST_MANIFEST}" def testManifest = lib.jenkins.TestManifest.new(readYaml(file: manifest)) dockerImage = testManifest.ci?.image?.name ?: 'opensearchstaging/ci-runner:ci-runner-centos7-v1' diff --git a/vars/downloadBuildManifest.groovy b/vars/downloadBuildManifest.groovy index 228c34838..e3c9885cd 100644 --- a/vars/downloadBuildManifest.groovy +++ b/vars/downloadBuildManifest.groovy @@ -7,7 +7,7 @@ * compatible open source license. */ def call(Map args = [:]) { - def lib = library(identifier: "jenkins@1.1.1", retriever: legacySCM(scm)) + def lib = library(identifier: "jenkins@1.1.2", retriever: legacySCM(scm)) sh "curl -sSL ${args.url} --output ${args.path}" def buildManifestObj = lib.jenkins.BuildManifest.new(readYaml(file: args.path)) diff --git a/vars/getManifestSHA.groovy b/vars/getManifestSHA.groovy index 30b7f1e79..b440f5246 100644 --- a/vars/getManifestSHA.groovy +++ b/vars/getManifestSHA.groovy @@ -21,7 +21,7 @@ Map call(Map args = [:]) { String manifestSHA = sha1(manifestLock) echo "Manifest SHA: ${manifestSHA}" - def lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + def lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) def inputManifestObj = lib.jenkins.InputManifest.new(readYaml(file: manifestLock)) String shasRoot = inputManifestObj.getSHAsRoot(jobName) String manifestSHAPath = "${shasRoot}/${manifestSHA}.yml" diff --git a/vars/promoteArtifacts.groovy b/vars/promoteArtifacts.groovy index c3a36754f..ad94512a4 100644 --- a/vars/promoteArtifacts.groovy +++ b/vars/promoteArtifacts.groovy @@ -8,7 +8,7 @@ */ void call(Map args = [:]) { - def lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + def lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) // fileActions are a closure that accepts a String, filepath with return type void List fileActions = args.fileActions ?: [] diff --git a/vars/promoteYumRepos.groovy b/vars/promoteYumRepos.groovy index c98991560..743187ff5 100644 --- a/vars/promoteYumRepos.groovy +++ b/vars/promoteYumRepos.groovy @@ -8,7 +8,7 @@ */ void call(Map args = [:]) { - def lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + def lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) String manifest = args.manifest ?: "manifests/${INPUT_MANIFEST}" def inputManifest = lib.jenkins.InputManifest.new(readYaml(file: manifest)) diff --git a/vars/rpmDashboardsDistValidation.groovy b/vars/rpmDashboardsDistValidation.groovy index 1010e1767..b2bddc35f 100644 --- a/vars/rpmDashboardsDistValidation.groovy +++ b/vars/rpmDashboardsDistValidation.groovy @@ -14,7 +14,7 @@ */ def call(Map args = [:]) { - def lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + def lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) def BundleManifestObj = lib.jenkins.BundleManifest.new(readYaml(file: args.bundleManifest)) def distFile = args.rpmDistribution def name = BundleManifestObj.build.getFilename() //opensearch-dashboards diff --git a/vars/rpmDistValidation.groovy b/vars/rpmDistValidation.groovy index 1e796511a..623496964 100644 --- a/vars/rpmDistValidation.groovy +++ b/vars/rpmDistValidation.groovy @@ -13,7 +13,7 @@ */ def call(Map args = [:]) { - def lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + def lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) def bundleManifestURL = args.bundleManifestURL sh ("curl -sL $bundleManifestURL -o $WORKSPACE/manifest.yml") def bundleManifest = "$WORKSPACE/manifest.yml" diff --git a/vars/rpmOpenSearchDistValidation.groovy b/vars/rpmOpenSearchDistValidation.groovy index 900a6fb4e..0c01d9772 100644 --- a/vars/rpmOpenSearchDistValidation.groovy +++ b/vars/rpmOpenSearchDistValidation.groovy @@ -14,7 +14,7 @@ */ def call(Map args = [:]) { - def lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + def lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) def BundleManifestObj = lib.jenkins.BundleManifest.new(readYaml(file: args.bundleManifest)) def distFile = args.rpmDistribution def name = BundleManifestObj.build.getFilename() //opensearch diff --git a/vars/runBwcTestScript.groovy b/vars/runBwcTestScript.groovy index ba53aa063..e83c1f792 100644 --- a/vars/runBwcTestScript.groovy +++ b/vars/runBwcTestScript.groovy @@ -8,7 +8,7 @@ */ void call(Map args = [:]) { String jobName = args.jobName ?: 'distribution-build-opensearch' - lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) def buildManifest = lib.jenkins.BuildManifest.new(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 a12eb8028..b3d8f2ec8 100644 --- a/vars/runGradleCheck.groovy +++ b/vars/runGradleCheck.groovy @@ -7,7 +7,7 @@ * compatible open source license. */ void call(Map args = [:]) { - def lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + def lib = library(identifier: 'jenkins@1.1.2', 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 0b2aec7c0..31d6516ec 100644 --- a/vars/runIntegTestScript.groovy +++ b/vars/runIntegTestScript.groovy @@ -7,7 +7,7 @@ * compatible open source license. */ void call(Map args = [:]) { - lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) String jobName = args.jobName ?: 'distribution-build-opensearch' def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.buildManifest)) diff --git a/vars/runPerfTestScript.groovy b/vars/runPerfTestScript.groovy index 2322bf77c..f7d25b09c 100644 --- a/vars/runPerfTestScript.groovy +++ b/vars/runPerfTestScript.groovy @@ -7,7 +7,7 @@ * compatible open source license. */ void call(Map args = [:]) { - lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.bundleManifest)) install_opensearch_infra_dependencies() diff --git a/vars/uploadArtifacts.groovy b/vars/uploadArtifacts.groovy index 84b1ab887..f45c5850b 100644 --- a/vars/uploadArtifacts.groovy +++ b/vars/uploadArtifacts.groovy @@ -7,7 +7,7 @@ * compatible open source license. */ void call(Map args = [:]) { - def lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + def lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.buildManifest)) def minArtifactPath = buildManifest.getMinArtifact() diff --git a/vars/uploadMinSnapshotsToS3.groovy b/vars/uploadMinSnapshotsToS3.groovy index 3ddf4216b..1029b7e68 100644 --- a/vars/uploadMinSnapshotsToS3.groovy +++ b/vars/uploadMinSnapshotsToS3.groovy @@ -7,7 +7,7 @@ * compatible open source license. */ void call(Map args = [:]) { - def lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + def lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) List fileActions = args.fileActions ?: [] String manifest = args.manifest ?: "manifests/${INPUT_MANIFEST}" diff --git a/vars/uploadTestResults.groovy b/vars/uploadTestResults.groovy index a2b479a43..2f79ae7cc 100644 --- a/vars/uploadTestResults.groovy +++ b/vars/uploadTestResults.groovy @@ -7,7 +7,7 @@ * compatible open source license. */ void call(Map args = [:]) { - def lib = library(identifier: 'jenkins@1.1.1', retriever: legacySCM(scm)) + def lib = library(identifier: 'jenkins@1.1.2', retriever: legacySCM(scm)) def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.buildManifestFileName))