fix

Signed-off-by: Sayali Gaikawad <[email protected]>
gaiksaya · Nov 9, 2024 · 5faaaaf · 5faaaaf
1 parent 6d47456
commit 5faaaaf
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 44 deletions.
diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile
@@ -836,42 +836,6 @@ pipeline {
                 }
             }
         }
-        stage('docker build') {
-            when {
-                beforeAgent true
-                allOf {
-                    expression {
-                        params.BUILD_DOCKER != 'do_not_build_docker'
-                    }
-                    expression {
-                        params.BUILD_PLATFORM.contains('linux')
-                    }
-                }
-            }
-            agent {
-                docker {
-                    label AGENT_LINUX_X64
-                    image dockerAgent.image
-                    args dockerAgent.args
-                    registryUrl 'https://public.ecr.aws/'
-                    alwaysPull true
-                }
-            }
-            steps {
-                script {
-                    echo "env.ARTIFACT_URL_LINUX_X64_TAR: ${env.ARTIFACT_URL_X64_TAR}"
-                    echo "env.ARTIFACT_URL_LINUX_ARM64_TAR: ${env.ARTIFACT_URL_ARM64_TAR}"
-
-                    buildDockerImage(
-                        inputManifest: "manifests/${INPUT_MANIFEST}",
-                        buildNumber: "${BUILD_NUMBER}",
-                        buildOption: "${BUILD_DOCKER}",
-                        artifactUrlX64: env.ARTIFACT_URL_LINUX_X64_TAR,
-                        artifactUrlArm64: env.ARTIFACT_URL_LINUX_ARM64_TAR
-                    )
-                }
-            }
-        }
     }
     post {
         always {

diff --git a/jenkins/opensearch/test-dist.jenkinsfile b/jenkins/opensearch/test-dist.jenkinsfile
@@ -24,6 +24,7 @@ pipeline {
     }
     stages {
         stage('build') {
+            parellel {
             parallel {
                 stage('build-and-test-linux-x64-tar') {
                     agent  { label AGENT_LINUX_X64 }
@@ -47,7 +48,6 @@ pipeline {
                         script {
                             echo 'Stage 3'
                             sleep 30
-                            exit 1
                         }
                     }
                     post {
@@ -58,20 +58,50 @@ pipeline {
                         }
                     }
                 }
-                stage('docker-build') {
-                    agent { label AGENT_LINUX_X64 }
+            }
+            parallel {
+                stage('build-and-test-linux-x64-tar') {
+                    agent  { label AGENT_LINUX_X64 }
+                    steps {
+                        script {
+                            echo 'Stage 1'
+                            sleep 30
+                        }
+                    }
+                    post {
+                        success {
+                            script {
+                                env.TAR_X64_SUCCESS = 'true'
+                            }
+                        }
+                    }
+                }
+                stage('build-and-test-linux-arm64-tar') {
+                    agent  { label AGENT_LINUX_X64 }
                     steps {
                         script {
-                            timeout(time: 5, unit: 'MINUTES') {
-                                waitUntil {
-                                    return (env.TAR_X64_SUCCESS == 'true' && env.TAR_ARM64_SUCCESS == 'true')
-                                }
+                            echo 'Stage 3'
+                            sleep 30
+                        }
+                    }
+                    post {
+                        success {
+                            script {
+                                env.TAR_ARM64_SUCCESS = 'true'
                             }
-                            echo 'Docker build done'
                         }
                     }
                 }
             }
+            }
+            stage('docker-build') {
+                agent { label AGENT_LINUX_X64 }
+                steps {
+                    script {
+                        echo 'Docker build done'
+                    }
+                }
+            }
         }
     }
     post {