Update docker-re-release jenkins-file to accomodate shared library ch…

…anges (#4193) Signed-off-by: Divya Madala <[email protected]>
opensearch-project · Nov 3, 2023 · c438635 · c438635
1 parent baba3b0
commit c438635
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/jenkins/docker/docker-re-release.jenkinsfile b/jenkins/docker/docker-re-release.jenkinsfile
@@ -7,7 +7,7 @@
  * compatible open source license.
  */
 
-lib = library(identifier: 'jenkins@5.6.0', retriever: modernSCM([
+lib = library(identifier: 'jenkins@5.11.1', retriever: modernSCM([
     $class: 'GitSCMSource',
     remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
 ]))
@@ -46,8 +46,7 @@ pipeline {
                         script {
                             patchDockerImage(
                                 product: "${PRODUCT}",
-                                tag: "${TAG}",
-                                re_release: true
+                                tag: "${TAG}"
                             )
                         }
                     }

diff --git a/tests/jenkins/TestDockerReRelease.groovy b/tests/jenkins/TestDockerReRelease.groovy
@@ -25,7 +25,7 @@ class TestDockerReRelease extends BuildPipelineTest {
 
         helper.registerSharedLibrary(
             library().name('jenkins')
-                .defaultVersion('5.6.0')
+                .defaultVersion('5.11.1')
                 .allowOverride(true)
                 .implicit(true)
                 .targetPath('vars')
@@ -48,8 +48,8 @@ class TestDockerReRelease extends BuildPipelineTest {
         helper.addShMock("""docker inspect --format '{{ index .Config.Labels "org.label-schema.description"}}' opensearchproject/opensearch:1""") { script ->
             return [stdout: "7756", exitValue: 0]
         }
-        helper.addShMock("""docker inspect --format '{{ index .Config.Labels "org.label-schema.build-date"}}' opensearchproject/opensearch:1""") { script ->
-            return [stdout: "2023-06-19T19:12:59Z", exitValue: 0]
+        helper.addShMock("""date +%Y%m%d""") { script ->
+            return [stdout: "20230619", exitValue: 0]
         }
         helper.addShMock("""docker inspect --format '{{ index .Config.Labels "org.label-schema.version"}}' opensearchproject/opensearch:latest""") { script ->
             return [stdout: "2.5.0", exitValue: 0]

diff --git a/tests/jenkins/jenkinsjob-regression-files/docker/docker-re-release.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/docker/docker-re-release.jenkinsfile.txt
@@ -1,29 +1,29 @@
    docker-re-release.run()
       docker-re-release.modernSCM({$class=GitSCMSource, remote=https://github.com/opensearch-project/opensearch-build-libraries.git})
-      docker-re-release.library({identifier=jenkins@5.6.0, retriever=null})
+      docker-re-release.library({identifier=jenkins@5.11.1, retriever=null})
       docker-re-release.pipeline(groovy.lang.Closure)
          docker-re-release.timeout({time=2, unit=HOURS})
          docker-re-release.echo(Executing on agent [label:none])
          docker-re-release.stage(Patch Docker Image, groovy.lang.Closure)
             docker-re-release.script(groovy.lang.Closure)
-               docker-re-release.patchDockerImage({product=opensearch, tag=1, re_release=true})
+               docker-re-release.patchDockerImage({product=opensearch, tag=1})
                   patchDockerImage.legacySCM(groovy.lang.Closure)
-                  patchDockerImage.library({identifier=jenkins@main, retriever=null})
+                  patchDockerImage.library({identifier=jenkins@5.11.1, retriever=null})
                   patchDockerImage.sh(#!/bin/bash
     set -e
     set +x
     docker pull opensearchproject/opensearch:1
     docker pull opensearchproject/opensearch:latest
     )
                   patchDockerImage.sh({script=docker inspect --format '{{ index .Config.Labels "org.label-schema.version"}}' opensearchproject/opensearch:1, returnStdout=true})
-                  patchDockerImage.sh({script=docker inspect --format '{{ index .Config.Labels "org.label-schema.build-date"}}' opensearchproject/opensearch:1, returnStdout=true})
+                  patchDockerImage.sh({script=date +%Y%m%d, returnStdout=true})
                   patchDockerImage.sh({script=docker inspect --format '{{ index .Config.Labels "org.label-schema.description"}}' opensearchproject/opensearch:1, returnStdout=true})
                   patchDockerImage.sh({script=docker inspect --format '{{ index .Config.Labels "org.label-schema.version"}}' opensearchproject/opensearch:latest, returnStdout=true})
                   patchDockerImage.readYaml({file=manifests/1.3.0/opensearch-1.3.0.yml})
                   InputManifest.asBoolean()
                   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})
                      buildDockerImage.legacySCM(groovy.lang.Closure)
-                     buildDockerImage.library({identifier=jenkins@5.5.0, retriever=null})
+                     buildDockerImage.library({identifier=jenkins@5.11.1, retriever=null})
                      buildDockerImage.readYaml({file=manifests/1.3.0/opensearch-1.3.0.yml})
                      InputManifest.asBoolean()
                      buildDockerImage.echo(Triggering docker-build)