Add docker-compose and fix docker-re-release lib version (#4174)

Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Oct 25, 2023 · e26fc82 · e26fc82
1 parent 48de658
commit e26fc82
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/docker/ci/config/windows-servercore-setup.ps1 b/docker/ci/config/windows-servercore-setup.ps1
@@ -206,6 +206,7 @@ scoop install unzip
 
 # Install docker
 scoop install docker
+scoop install docker-compose
 
 # Scoop cleanup
 scoop cache rm *

diff --git a/docker/ci/dockerfiles/current/build.ubuntu2004.opensearch.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/build.ubuntu2004.opensearch.x64.arm64.dockerfile
@@ -31,7 +31,7 @@ RUN apt-get update -y && apt-get upgrade -y && apt-get install -y docker.io curl
 
 # Install pip packages
 RUN curl -SL https://bootstrap.pypa.io/get-pip.py | python && \
-    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.22.12
+    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.22.12 docker-compose==1.29.2
 
 # Install aptly and required changes to debmake
 # Remove lintian for now due to it takes nearly 20 minutes for OpenSearch as well as nearly an hour for OpenSearch-Dashboards during debmake

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.7.2', retriever: modernSCM([
+lib = library(identifier: 'jenkins@5.6.0', retriever: modernSCM([
     $class: 'GitSCMSource',
     remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
 ]))

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.8.0')
+                .defaultVersion('5.6.0')
                 .allowOverride(true)
                 .implicit(true)
                 .targetPath('vars')

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,14 +1,14 @@
    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.7.2, retriever=null})
+      docker-re-release.library({identifier=jenkins@5.6.0, 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})
                   patchDockerImage.legacySCM(groovy.lang.Closure)
-                  patchDockerImage.library({identifier=jenkins@5.8.0, retriever=null})
+                  patchDockerImage.library({identifier=jenkins@main, retriever=null})
                   patchDockerImage.sh(#!/bin/bash
     set -e
     set +x
@@ -23,7 +23,7 @@
                   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.8.0, retriever=null})
+                     buildDockerImage.library({identifier=jenkins@5.5.0, retriever=null})
                      buildDockerImage.readYaml({file=manifests/1.3.0/opensearch-1.3.0.yml})
                      InputManifest.asBoolean()
                      buildDockerImage.echo(Triggering docker-build)