updated

build/push-docker-tag.Jenkinsfile

@@ -43,24 +43,36 @@ pipeline {
                                 }
                                 sh "docker login --username=$dockerUser --password=$dockerPassword"
                                 catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') {
-                                    sh "docker manifest inspect scrolltech/bridge:$TAGNAME > /dev/null"
+                                    script {
+                                        try {
+                                            sh "docker manifest inspect scrolltech/bridge:$TAGNAME > /dev/null"
+                                        } catch (e) {
+                                            // only build if the tag non existed
+                                            //sh "docker login --username=${dockerUser} --password=${dockerPassword}"
+                                            sh "make -C bridge docker"
+                                            sh "docker tag scrolltech/bridge:latest scrolltech/bridge:${TAGNAME}"
+                                            sh "docker push scrolltech/bridge:${TAGNAME}"
+                                            throw e
+                                        }
+                                    }
                                 }
-                                def condition = sh(returnStdout: true, script: 'echo $?')
-                                echo condition
-                                // skip the building part if the tag already existed
-                                if (condition == 0) {
-                                    return;
+                                catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') {
+                                    script {
+                                        try {
+                                            sh "docker manifest inspect scrolltech/coordinator:$TAGNAME > /dev/null"
+                                        } catch (e) {
+                                            // only build if the tag non existed
+                                            //sh "docker login --username=${dockerUser} --password=${dockerPassword}"
+                                            sh "make -C coordinator docker"
+                                            sh "docker tag scrolltech/coordinator:latest scrolltech/coordinator:${TAGNAME}"
+                                            sh "docker push scrolltech/coordinator:${TAGNAME}"
+                                            throw e
+                                        }
+                                    }
                                 }
-                                // sh "docker login --username=${dockerUser} --password=${dockerPassword}"
-                                // sh "make -C bridge docker"
-                                // sh "make -C coordinator docker"
-                                // sh "docker tag scrolltech/bridge:latest scrolltech/bridge:${TAGNAME}"
-                                // sh "docker tag scrolltech/coordinator:latest scrolltech/coordinator:${TAGNAME}"
-                                // sh "docker push scrolltech/bridge:${TAGNAME}"
-                                // sh "docker push scrolltech/coordinator:${TAGNAME}"
                             }                              
                     }
-               }
+                }
             }
         }
     }