Skip to content

Commit

Permalink
Fix the tag latest and major for docker copy (#2816)
Browse files Browse the repository at this point in the history 
Signed-off-by: Zelin Hao <zelinhao@amazon.com>

Signed-off-by: Zelin Hao <zelinhao@amazon.com>
  • Loading branch information
@zelinh
zelinh authored Oct 28, 2022
1 parent 893fa1d commit 5aa34e6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 24 deletions.
8 changes: 4 additions & 4 deletions jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -107,7 +107,7 @@ pipeline {
]
}

if (RELEASE_LATEST_TAG) {
if (params.RELEASE_LATEST_TAG) {
def dockerCopyHubLatest =
build job: 'docker-copy',
parameters: [
Expand All @@ -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',
Expand All @@ -144,7 +144,7 @@ pipeline {
]
}

if (RELEASE_LATEST_TAG) {
if (params.RELEASE_LATEST_TAG) {
def dockerCopyECRLatest =
build job: 'docker-copy',
parameters: [
Expand Down
10 changes: 0 additions & 10 deletions ...kinsjob-regression-files/data-prepper/release-data-prepper-latest-version.jenkinsfile.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,13 @@
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})
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.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})
Expand Down
10 changes: 0 additions & 10 deletions ...nkinsjob-regression-files/data-prepper/release-data-prepper-major-version.jenkinsfile.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,13 @@
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})
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.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})
Expand Down

0 comments on commit 5aa34e6

Please sign in to comment.