Add qualifier support for docker build task (#1844)

* Add qualifier support for docker build Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Remove comments Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Remove comments Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Remove comments Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Update with fixes to handle string null Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
opensearch-project · Mar 29, 2022 · ff40ffb · ff40ffb
1 parent adab7dc
commit ff40ffb
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 2 deletions.
diff --git a/src/jenkins/InputManifest.groovy b/src/jenkins/InputManifest.groovy
@@ -35,12 +35,14 @@ class InputManifest {
     class Build implements Serializable {
         String name
         String version
+        String qualifier
         String platform
         String architecture
 
         Build(Map data) {
             this.name = data.name
             this.version = data.version
+            this.qualifier = data.qualifier
             this.platform = data.platform
             this.architecture = data.architecture
         }

diff --git a/tests/jenkins/TestBuildDockerImage.groovy b/tests/jenkins/TestBuildDockerImage.groovy
@@ -60,4 +60,15 @@ class TestBuildDockerImage extends BuildPipelineTest {
             "tests/jenkins/jobs/BuildDockerImage_Jenkinsfile_skips_arm64"
         )
     }
+
+    @Test
+    public void testBuildsQualifierBoth() {
+        binding.env.ARTIFACT_URL_linux_x64 = 'opensearch.linux.x64'
+        binding.env.ARTIFACT_URL_linux_arm64 = 'opensearch.linux.arm64'
+
+        super.testPipeline(
+            "tests/jenkins/jobs/BuildDockerImage_Qualifier_Jenkinsfile",
+            "tests/jenkins/jobs/BuildDockerImage_Qualifier_Jenkinsfile_builds_both"
+        )
+    }
 }
diff --git a/tests/jenkins/data/opensearch-2.0.0.yml b/tests/jenkins/data/opensearch-2.0.0.yml
@@ -0,0 +1,17 @@
+---
+schema-version: '1.0'
+build:
+  name: OpenSearch
+  version: 2.0.0
+  qualifier: alpha1
+ci:
+  image:
+    name: opensearchstaging/ci-runner:ci-runner-centos7-v1
+    args: -e JAVA_HOME=/opt/java/openjdk-17
+components:
+  - name: OpenSearch
+    ref: '2.0'
+    repository: https://github.com/opensearch-project/OpenSearch.git
+    checks:
+      - gradle:publish
+      - gradle:properties:version
diff --git a/tests/jenkins/jobs/BuildDockerImage_Qualifier_Jenkinsfile b/tests/jenkins/jobs/BuildDockerImage_Qualifier_Jenkinsfile
@@ -0,0 +1,16 @@
+pipeline {
+    agent none
+    stages {
+        stage('build docker image') {
+            steps {
+                script {
+                    buildDockerImage(
+                        inputManifest: 'tests/jenkins/data/opensearch-2.0.0.yml',
+                        artifactUrlX64: env.ARTIFACT_URL_linux_x64,
+                        artifactUrlArm64: env.ARTIFACT_URL_linux_arm64
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/tests/jenkins/jobs/BuildDockerImage_Qualifier_Jenkinsfile_builds_both.txt b/tests/jenkins/jobs/BuildDockerImage_Qualifier_Jenkinsfile_builds_both.txt
@@ -0,0 +1,16 @@
+   BuildDockerImage_Qualifier_Jenkinsfile.run()
+      BuildDockerImage_Qualifier_Jenkinsfile.pipeline(groovy.lang.Closure)
+         BuildDockerImage_Qualifier_Jenkinsfile.echo(Executing on agent [label:none])
+         BuildDockerImage_Qualifier_Jenkinsfile.stage(build docker image, groovy.lang.Closure)
+            BuildDockerImage_Qualifier_Jenkinsfile.script(groovy.lang.Closure)
+               BuildDockerImage_Qualifier_Jenkinsfile.buildDockerImage({inputManifest=tests/jenkins/data/opensearch-2.0.0.yml, artifactUrlX64=opensearch.linux.x64, artifactUrlArm64=opensearch.linux.arm64})
+                  buildDockerImage.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
+                  buildDockerImage.legacySCM(groovy.lang.Closure)
+                  buildDockerImage.library({identifier=jenkins@20211123, retriever=null})
+                  buildDockerImage.readYaml({file=tests/jenkins/data/opensearch-2.0.0.yml})
+                  InputManifest.asBoolean()
+                  buildDockerImage.string({name=DOCKER_BUILD_GIT_REPOSITORY, value=https://github.com/opensearch-project/opensearch-build})
+                  buildDockerImage.string({name=DOCKER_BUILD_GIT_REPOSITORY_REFERENCE, value=main})
+                  buildDockerImage.string({name=DOCKER_BUILD_SCRIPT_WITH_COMMANDS, value=id && pwd && cd docker/release && curl -sSL opensearch.linux.x64 -o opensearch-x64.tgz && curl -sSL opensearch.linux.arm64 -o opensearch-arm64.tgz && bash build-image-multi-arch.sh -v 2.0.0-alpha1 -f ./dockerfiles/opensearch.al2.dockerfile -p opensearch -a 'x64,arm64' -r opensearchstaging/opensearch -t 'opensearch-x64.tgz,opensearch-arm64.tgz' -n 33})
+                  buildDockerImage.booleanParam({name=IS_STAGING, value=true})
+                  buildDockerImage.build({job=docker-build, parameters=[null, null, null, null]})
diff --git a/vars/buildDockerImage.groovy b/vars/buildDockerImage.groovy
@@ -3,7 +3,14 @@ void call(Map args = [:]) {
 
     def lib = library(identifier: 'jenkins@20211123', retriever: legacySCM(scm))
     def inputManifest = lib.jenkins.InputManifest.new(readYaml(file: args.inputManifest))
+    def build_qualifier = inputManifest.build.qualifier
 
+    if (build_qualifier != null && build_qualifier != 'null') {
+        build_qualifier = "-" + build_qualifier
+    }
+    else {
+        build_qualifier = ''
+    }
     String filename = inputManifest.build.getFilename()
 
     if (args.artifactUrlX64 == null || args.artifactUrlArm64 ==  null) {
@@ -23,7 +30,7 @@ void call(Map args = [:]) {
                         [
                             'bash',
                             'build-image-multi-arch.sh',
-                            "-v ${inputManifest.build.version}",
+                            "-v ${inputManifest.build.version}${build_qualifier}",
                             "-f ./dockerfiles/${filename}.al2.dockerfile",
                             "-p ${filename}",
                             "-a 'x64,arm64'",
@@ -36,4 +43,4 @@ void call(Map args = [:]) {
             ]
         }
     }
-}
+}