Make sure the build repo is pulled in docker-build stage

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
opensearch-project · Apr 29, 2022 · 02c1262 · 02c1262
1 parent ec6c37c
commit 02c1262
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 23 deletions.
diff --git a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile
@@ -433,18 +433,24 @@ pipeline {
                     return params.BUILD_DOCKER
                 }
             }
+            agent {
+                docker {
+                    label AGENT_X64
+                    image dockerAgent.image
+                    args dockerAgent.args
+                    alwaysPull true
+                }
+            }
             steps {
-                node(AGENT_X64) {
-                    script {
-                        echo "env.ARTIFACT_URL_X64_TAR: ${env.ARTIFACT_URL_X64_TAR}"
-                        echo "env.ARTIFACT_URL_ARM64_TAR: ${env.ARTIFACT_URL_ARM64_TAR}"
-
-                        buildDockerImage(
-                            inputManifest: "manifests/${INPUT_MANIFEST}",
-                            artifactUrlX64: env.ARTIFACT_URL_X64_TAR,
-                            artifactUrlArm64: env.ARTIFACT_URL_ARM64_TAR
-                        )
-                    }
+                script {
+                    echo "env.ARTIFACT_URL_X64_TAR: ${env.ARTIFACT_URL_X64_TAR}"
+                    echo "env.ARTIFACT_URL_ARM64_TAR: ${env.ARTIFACT_URL_ARM64_TAR}"
+
+                    buildDockerImage(
+                        inputManifest: "manifests/${INPUT_MANIFEST}",
+                        artifactUrlX64: env.ARTIFACT_URL_X64_TAR,
+                        artifactUrlArm64: env.ARTIFACT_URL_ARM64_TAR
+                    )
                 }
             }
         }

diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile
@@ -432,19 +432,24 @@ pipeline {
                     return params.BUILD_DOCKER
                 }
             }
+            agent {
+                docker {
+                    label AGENT_X64
+                    image dockerAgent.image
+                    args dockerAgent.args
+                    alwaysPull true
+                }
+            }
             steps {
-                node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') {
-                    script {
-
-                        echo "env.ARTIFACT_URL_X64_TAR: ${env.ARTIFACT_URL_X64_TAR}"
-                        echo "env.ARTIFACT_URL_ARM64_TAR: ${env.ARTIFACT_URL_ARM64_TAR}"
-
-                        buildDockerImage(
-                            inputManifest: "manifests/${INPUT_MANIFEST}",
-                            artifactUrlX64: env.ARTIFACT_URL_X64_TAR,
-                            artifactUrlArm64: env.ARTIFACT_URL_ARM64_TAR
-                        )
-                    }
+                script {
+                    echo "env.ARTIFACT_URL_X64_TAR: ${env.ARTIFACT_URL_X64_TAR}"
+                    echo "env.ARTIFACT_URL_ARM64_TAR: ${env.ARTIFACT_URL_ARM64_TAR}"
+
+                    buildDockerImage(
+                        inputManifest: "manifests/${INPUT_MANIFEST}",
+                        artifactUrlX64: env.ARTIFACT_URL_X64_TAR,
+                        artifactUrlArm64: env.ARTIFACT_URL_ARM64_TAR
+                    )
                 }
             }
         }