Skip to content

Commit

Permalink
upgrade to 1.1.1 with changes in opensearch-project#28
Browse files Browse the repository at this point in the history
Signed-off-by: Peter Zhu <[email protected]>
  • Loading branch information
peterzhuamazon committed Nov 5, 2022
1 parent 5398941 commit 1230d35
Show file tree
Hide file tree
Showing 26 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion vars/archiveAssembleUpload.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* compatible open source license.
*/
def call(Map args = [:]) {
lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))
def inputManifestObj = lib.jenkins.InputManifest.new(readYaml(file: args.inputManifest))

String stashName = "${args.stashName}"
Expand Down
2 changes: 1 addition & 1 deletion vars/assembleManifest.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* compatible open source license.
*/
void call(Map args = [:]) {
lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
lib = library(identifier: '[email protected].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}")
Expand Down
2 changes: 1 addition & 1 deletion vars/assembleUpload.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/
void call(Map args = [:]) {

lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))

assembleManifest(args)
uploadArtifacts(args)
Expand Down
2 changes: 1 addition & 1 deletion vars/buildArchive.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* compatible open source license.
*/
void call(Map args = [:]) {
def lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
def lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))
buildManifest(args)

String stashName = "${args.stashName}"
Expand Down
2 changes: 1 addition & 1 deletion vars/buildAssembleUpload.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* compatible open source license.
*/
def call(Map args = [:]) {
def lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
def lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))
def inputManifestObj = lib.jenkins.InputManifest.new(readYaml(file: args.inputManifest))

buildManifest(args)
Expand Down
2 changes: 1 addition & 1 deletion vars/buildDockerImage.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* compatible open source license.
*/
void call(Map args = [:]) {
def lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
def lib = library(identifier: '[email protected].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}"
Expand Down
2 changes: 1 addition & 1 deletion vars/buildUploadManifestSHA.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* compatible open source license.
*/
void call(Map args = [:]) {
lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))

def sha = getManifestSHA(args)

Expand Down
2 changes: 1 addition & 1 deletion vars/buildYumRepo.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* compatible open source license.
*/
void call(Map args = [:]) {
lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))

def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.buildManifest))
echo "Create yum repo metadata and repo file ${args.buildManifest}"
Expand Down
2 changes: 1 addition & 1 deletion vars/createReleaseTag.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/
def call(Map args = [:]) {

def lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
def lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))
def bundleManifestObj = lib.jenkins.BundleManifest.new(readYaml(file: args.distManifest))

def componentsName = bundleManifestObj.getNames()
Expand Down
2 changes: 1 addition & 1 deletion vars/createSignatureFiles.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/
Closure call() {

lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))

return { args -> signArtifacts(args) }

Expand Down
2 changes: 1 addition & 1 deletion vars/detectDockerAgent.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* compatible open source license.
*/
Map call(Map args = [:]) {
def lib = library(identifier: "[email protected].1", retriever: legacySCM(scm))
def lib = library(identifier: "[email protected].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'
Expand Down
2 changes: 1 addition & 1 deletion vars/detectTestDockerAgent.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* compatible open source license.
*/
Map call(Map args = [:]) {
def lib = library(identifier: "[email protected].1", retriever: legacySCM(scm))
def lib = library(identifier: "[email protected].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'
Expand Down
2 changes: 1 addition & 1 deletion vars/downloadBuildManifest.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* compatible open source license.
*/
def call(Map args = [:]) {
def lib = library(identifier: "[email protected].1", retriever: legacySCM(scm))
def lib = library(identifier: "[email protected].2", retriever: legacySCM(scm))

sh "curl -sSL ${args.url} --output ${args.path}"
def buildManifestObj = lib.jenkins.BuildManifest.new(readYaml(file: args.path))
Expand Down
2 changes: 1 addition & 1 deletion vars/getManifestSHA.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Map call(Map args = [:]) {
String manifestSHA = sha1(manifestLock)
echo "Manifest SHA: ${manifestSHA}"

def lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
def lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))
def inputManifestObj = lib.jenkins.InputManifest.new(readYaml(file: manifestLock))
String shasRoot = inputManifestObj.getSHAsRoot(jobName)
String manifestSHAPath = "${shasRoot}/${manifestSHA}.yml"
Expand Down
2 changes: 1 addition & 1 deletion vars/promoteArtifacts.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

void call(Map args = [:]) {
def lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
def lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))

// fileActions are a closure that accepts a String, filepath with return type void
List<Closure> fileActions = args.fileActions ?: []
Expand Down
2 changes: 1 addition & 1 deletion vars/promoteYumRepos.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

void call(Map args = [:]) {
def lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
def lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))

String manifest = args.manifest ?: "manifests/${INPUT_MANIFEST}"
def inputManifest = lib.jenkins.InputManifest.new(readYaml(file: manifest))
Expand Down
2 changes: 1 addition & 1 deletion vars/rpmDashboardsDistValidation.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
def call(Map args = [:]) {

def lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
def lib = library(identifier: '[email protected].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
Expand Down
2 changes: 1 addition & 1 deletion vars/rpmDistValidation.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/
def call(Map args = [:]) {

def lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
def lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))
def bundleManifestURL = args.bundleManifestURL
sh ("curl -sL $bundleManifestURL -o $WORKSPACE/manifest.yml")
def bundleManifest = "$WORKSPACE/manifest.yml"
Expand Down
2 changes: 1 addition & 1 deletion vars/rpmOpenSearchDistValidation.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
def call(Map args = [:]) {

def lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
def lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))
def BundleManifestObj = lib.jenkins.BundleManifest.new(readYaml(file: args.bundleManifest))
def distFile = args.rpmDistribution
def name = BundleManifestObj.build.getFilename() //opensearch
Expand Down
2 changes: 1 addition & 1 deletion vars/runBwcTestScript.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/
void call(Map args = [:]) {
String jobName = args.jobName ?: 'distribution-build-opensearch'
lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
lib = library(identifier: '[email protected].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}"
Expand Down
2 changes: 1 addition & 1 deletion vars/runGradleCheck.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* compatible open source license.
*/
void call(Map args = [:]) {
def lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
def lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))
def git_repo_url = args.gitRepoUrl ?: 'null'
def git_reference = args.gitReference ?: 'null'

Expand Down
2 changes: 1 addition & 1 deletion vars/runIntegTestScript.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* compatible open source license.
*/
void call(Map args = [:]) {
lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))

String jobName = args.jobName ?: 'distribution-build-opensearch'
def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.buildManifest))
Expand Down
2 changes: 1 addition & 1 deletion vars/runPerfTestScript.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* compatible open source license.
*/
void call(Map args = [:]) {
lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))
def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.bundleManifest))

install_opensearch_infra_dependencies()
Expand Down
2 changes: 1 addition & 1 deletion vars/uploadArtifacts.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* compatible open source license.
*/
void call(Map args = [:]) {
def lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
def lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))

def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.buildManifest))
def minArtifactPath = buildManifest.getMinArtifact()
Expand Down
2 changes: 1 addition & 1 deletion vars/uploadMinSnapshotsToS3.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* compatible open source license.
*/
void call(Map args = [:]) {
def lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
def lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))
List<Closure> fileActions = args.fileActions ?: []
String manifest = args.manifest ?: "manifests/${INPUT_MANIFEST}"

Expand Down
2 changes: 1 addition & 1 deletion vars/uploadTestResults.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* compatible open source license.
*/
void call(Map args = [:]) {
def lib = library(identifier: '[email protected].1', retriever: legacySCM(scm))
def lib = library(identifier: '[email protected].2', retriever: legacySCM(scm))

def buildManifest = lib.jenkins.BuildManifest.new(readYaml(file: args.buildManifestFileName))

Expand Down

0 comments on commit 1230d35

Please sign in to comment.