diff --git a/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile b/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile index 06ef3e2c63..d66c189bec 100644 --- a/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile +++ b/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile @@ -95,7 +95,7 @@ pipeline { string(name: 'DESTINATION_IMAGE', value: "data-prepper:${VERSION}") ] - if (RELEASE_MAJOR_TAG) { + if (params.RELEASE_MAJOR_TAG) { def majorVersion = VERSION.tokenize(".")[0].trim() def dockerCopyHubMajor = build job: 'docker-copy', @@ -107,7 +107,7 @@ pipeline { ] } - if (RELEASE_LATEST_TAG) { + if (params.RELEASE_LATEST_TAG) { def dockerCopyHubLatest = build job: 'docker-copy', parameters: [ @@ -132,7 +132,7 @@ pipeline { string(name: 'DESTINATION_IMAGE', value: "data-prepper:${VERSION}") ] - if (RELEASE_MAJOR_TAG) { + if (params.RELEASE_MAJOR_TAG) { def majorVersion = VERSION.tokenize(".")[0].trim() def dockerCopyECRMajor = build job: 'docker-copy', @@ -144,7 +144,7 @@ pipeline { ] } - if (RELEASE_LATEST_TAG) { + if (params.RELEASE_LATEST_TAG) { def dockerCopyECRLatest = build job: 'docker-copy', parameters: [ diff --git a/tests/jenkins/jenkinsjob-regression-files/data-prepper/release-data-prepper-latest-version.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/data-prepper/release-data-prepper-latest-version.jenkinsfile.txt index 8ff5a244e8..1d906a29a5 100644 --- a/tests/jenkins/jenkinsjob-regression-files/data-prepper/release-data-prepper-latest-version.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/data-prepper/release-data-prepper-latest-version.jenkinsfile.txt @@ -51,11 +51,6 @@ release-data-prepper-all-artifacts.string({name=DESTINATION_IMAGE_REGISTRY, value=opensearchproject}) release-data-prepper-all-artifacts.string({name=DESTINATION_IMAGE, value=data-prepper:0.22.1}) release-data-prepper-all-artifacts.build({job=docker-copy, parameters=[null, null, null, null]}) - release-data-prepper-all-artifacts.string({name=SOURCE_IMAGE_REGISTRY, value=http://public.ecr.aws/data-prepper-container-repository}) - release-data-prepper-all-artifacts.string({name=SOURCE_IMAGE, value=data-prepper:0.22.1-997908}) - release-data-prepper-all-artifacts.string({name=DESTINATION_IMAGE_REGISTRY, value=opensearchproject}) - release-data-prepper-all-artifacts.string({name=DESTINATION_IMAGE, value=data-prepper:latest}) - release-data-prepper-all-artifacts.build({job=docker-copy, parameters=[null, null, null, null]}) release-data-prepper-all-artifacts.stage(Copy Docker Image to ECR, groovy.lang.Closure) release-data-prepper-all-artifacts.script(groovy.lang.Closure) release-data-prepper-all-artifacts.string({name=SOURCE_IMAGE_REGISTRY, value=http://public.ecr.aws/data-prepper-container-repository}) @@ -63,11 +58,6 @@ release-data-prepper-all-artifacts.string({name=DESTINATION_IMAGE_REGISTRY, value=public.ecr.aws/opensearchproject}) release-data-prepper-all-artifacts.string({name=DESTINATION_IMAGE, value=data-prepper:0.22.1}) release-data-prepper-all-artifacts.build({job=docker-copy, parameters=[null, null, null, null]}) - release-data-prepper-all-artifacts.string({name=SOURCE_IMAGE_REGISTRY, value=http://public.ecr.aws/data-prepper-container-repository}) - release-data-prepper-all-artifacts.string({name=SOURCE_IMAGE, value=data-prepper:0.22.1-997908}) - release-data-prepper-all-artifacts.string({name=DESTINATION_IMAGE_REGISTRY, value=public.ecr.aws/opensearchproject}) - release-data-prepper-all-artifacts.string({name=DESTINATION_IMAGE, value=data-prepper:latest}) - release-data-prepper-all-artifacts.build({job=docker-copy, parameters=[null, null, null, null]}) release-data-prepper-all-artifacts.script(groovy.lang.Closure) release-data-prepper-all-artifacts.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) diff --git a/tests/jenkins/jenkinsjob-regression-files/data-prepper/release-data-prepper-major-version.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/data-prepper/release-data-prepper-major-version.jenkinsfile.txt index 733d6338a9..1d906a29a5 100644 --- a/tests/jenkins/jenkinsjob-regression-files/data-prepper/release-data-prepper-major-version.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/data-prepper/release-data-prepper-major-version.jenkinsfile.txt @@ -51,11 +51,6 @@ release-data-prepper-all-artifacts.string({name=DESTINATION_IMAGE_REGISTRY, value=opensearchproject}) release-data-prepper-all-artifacts.string({name=DESTINATION_IMAGE, value=data-prepper:0.22.1}) release-data-prepper-all-artifacts.build({job=docker-copy, parameters=[null, null, null, null]}) - release-data-prepper-all-artifacts.string({name=SOURCE_IMAGE_REGISTRY, value=http://public.ecr.aws/data-prepper-container-repository}) - release-data-prepper-all-artifacts.string({name=SOURCE_IMAGE, value=data-prepper:0.22.1-997908}) - release-data-prepper-all-artifacts.string({name=DESTINATION_IMAGE_REGISTRY, value=opensearchproject}) - release-data-prepper-all-artifacts.string({name=DESTINATION_IMAGE, value=data-prepper:0}) - release-data-prepper-all-artifacts.build({job=docker-copy, parameters=[null, null, null, null]}) release-data-prepper-all-artifacts.stage(Copy Docker Image to ECR, groovy.lang.Closure) release-data-prepper-all-artifacts.script(groovy.lang.Closure) release-data-prepper-all-artifacts.string({name=SOURCE_IMAGE_REGISTRY, value=http://public.ecr.aws/data-prepper-container-repository}) @@ -63,11 +58,6 @@ release-data-prepper-all-artifacts.string({name=DESTINATION_IMAGE_REGISTRY, value=public.ecr.aws/opensearchproject}) release-data-prepper-all-artifacts.string({name=DESTINATION_IMAGE, value=data-prepper:0.22.1}) release-data-prepper-all-artifacts.build({job=docker-copy, parameters=[null, null, null, null]}) - release-data-prepper-all-artifacts.string({name=SOURCE_IMAGE_REGISTRY, value=http://public.ecr.aws/data-prepper-container-repository}) - release-data-prepper-all-artifacts.string({name=SOURCE_IMAGE, value=data-prepper:0.22.1-997908}) - release-data-prepper-all-artifacts.string({name=DESTINATION_IMAGE_REGISTRY, value=public.ecr.aws/opensearchproject}) - release-data-prepper-all-artifacts.string({name=DESTINATION_IMAGE, value=data-prepper:0}) - release-data-prepper-all-artifacts.build({job=docker-copy, parameters=[null, null, null, null]}) release-data-prepper-all-artifacts.script(groovy.lang.Closure) release-data-prepper-all-artifacts.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})