Skip to content

Commit 59578c8

Browse files
Switch docker re-release to use 6.2.0 lib in jenkinsfile (#4393)
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
1 parent 9db2234 commit 59578c8

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

jenkins/docker/docker-re-release.jenkinsfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* compatible open source license.
88
*/
99

10-
lib = library(identifier: 'jenkins@5.11.1', retriever: modernSCM([
10+
lib = library(identifier: 'jenkins@6.2.0', retriever: modernSCM([
1111
$class: 'GitSCMSource',
1212
remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
1313
]))
@@ -61,6 +61,7 @@ pipeline {
6161
post {
6262
always {
6363
postCleanup()
64+
sh("docker image prune -f --all")
6465
}
6566
}
6667
}

tests/jenkins/TestDockerReRelease.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class TestDockerReRelease extends BuildPipelineTest {
2525

2626
helper.registerSharedLibrary(
2727
library().name('jenkins')
28-
.defaultVersion('5.11.1')
28+
.defaultVersion('6.2.0')
2929
.allowOverride(true)
3030
.implicit(true)
3131
.targetPath('vars')

tests/jenkins/jenkinsjob-regression-files/docker/docker-re-release.jenkinsfile.txt

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
docker-re-release.run()
22
docker-re-release.modernSCM({$class=GitSCMSource, remote=https://github.com/opensearch-project/opensearch-build-libraries.git})
3-
docker-re-release.library({identifier=jenkins@5.11.1, retriever=null})
3+
docker-re-release.library({identifier=jenkins@6.2.0, retriever=null})
44
docker-re-release.pipeline(groovy.lang.Closure)
55
docker-re-release.timeout({time=2, unit=HOURS})
66
docker-re-release.echo(Executing on agent [label:none])
@@ -14,7 +14,7 @@
1414
docker-re-release.script(groovy.lang.Closure)
1515
docker-re-release.patchDockerImage({product=opensearch, tag=1})
1616
patchDockerImage.legacySCM(groovy.lang.Closure)
17-
patchDockerImage.library({identifier=jenkins@5.11.1, retriever=null})
17+
patchDockerImage.library({identifier=jenkins@6.2.0, retriever=null})
1818
patchDockerImage.sh(#!/bin/bash
1919
set -e
2020
set +x
@@ -27,14 +27,14 @@
2727
patchDockerImage.sh({script=docker inspect --format '{{ index .Config.Labels "org.label-schema.version"}}' opensearchproject/opensearch:latest, returnStdout=true})
2828
patchDockerImage.readYaml({file=manifests/1.3.0/opensearch-1.3.0.yml})
2929
InputManifest.asBoolean()
30-
patchDockerImage.buildDockerImage({inputManifest=manifests/1.3.0/opensearch-1.3.0.yml, buildNumber=7756, buildDate=20230619, buildOption=re_release_docker_image, artifactUrlX64=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/7756/linux/x64/tar/dist/opensearch/opensearch-1.3.0-linux-x64.tar.gz, artifactUrlArm64=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/7756/linux/arm64/tar/dist/opensearch/opensearch-1.3.0-linux-arm64.tar.gz})
30+
patchDockerImage.buildDockerImage({inputManifest=manifests/1.3.0/opensearch-1.3.0.yml, buildNumber=7756, buildGitRef=1.3.0, buildDate=20230619, buildOption=re_release_docker_image, artifactUrlX64=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/7756/linux/x64/tar/dist/opensearch/opensearch-1.3.0-linux-x64.tar.gz, artifactUrlArm64=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/7756/linux/arm64/tar/dist/opensearch/opensearch-1.3.0-linux-arm64.tar.gz})
3131
buildDockerImage.legacySCM(groovy.lang.Closure)
32-
buildDockerImage.library({identifier=jenkins@5.11.1, retriever=null})
32+
buildDockerImage.library({identifier=jenkins@6.2.0, retriever=null})
3333
buildDockerImage.readYaml({file=manifests/1.3.0/opensearch-1.3.0.yml})
3434
InputManifest.asBoolean()
3535
buildDockerImage.echo(Triggering docker-build)
3636
buildDockerImage.string({name=DOCKER_BUILD_GIT_REPOSITORY, value=https://github.com/opensearch-project/opensearch-build})
37-
buildDockerImage.string({name=DOCKER_BUILD_GIT_REPOSITORY_REFERENCE, value=main})
37+
buildDockerImage.string({name=DOCKER_BUILD_GIT_REPOSITORY_REFERENCE, value=1.3.0})
3838
buildDockerImage.string({name=DOCKER_BUILD_SCRIPT_WITH_COMMANDS, value=id && pwd && cd docker/release && curl -sSL https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/7756/linux/x64/tar/dist/opensearch/opensearch-1.3.0-linux-x64.tar.gz -o opensearch-x64.tgz && curl -sSL https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/7756/linux/arm64/tar/dist/opensearch/opensearch-1.3.0-linux-arm64.tar.gz -o opensearch-arm64.tgz && bash build-image-multi-arch.sh -v 1.3.0 -f ./dockerfiles/opensearch.al2.dockerfile -p opensearch -a 'x64,arm64' -r opensearchstaging/opensearch -t 'opensearch-x64.tgz,opensearch-arm64.tgz' -n 7756})
3939
buildDockerImage.build({job=docker-build, propagate=true, wait=true, parameters=[null, null, null]})
4040
buildDockerImage.echo(Triggering docker create tag with build number)
@@ -53,3 +53,4 @@
5353
patchDockerImage.build({job=docker-promotion, propagate=true, wait=true, parameters=[null, null, null]})
5454
docker-re-release.postCleanup()
5555
postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
56+
docker-re-release.sh(docker image prune -f --all)

0 commit comments

Comments
 (0)