Changeset 25903

Timestamp:

12/19/20 21:04:32 (4 years ago)

Author:

jdquinn

Message:

BUG: Proper collection of exit codes from individual scripts

Location:

issm/trunk-jpl/packagers

Files:

• linux/complete-issm-linux-binaries-matlab.sh (modified) (3 diffs)
• linux/complete-issm-linux-binaries-python.sh (modified) (3 diffs)
• mac/complete-issm-mac-binaries-matlab.sh (modified) (4 diffs)
• mac/complete-issm-mac-binaries-python.sh (modified) (4 diffs)

issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-matlab.sh

@@ -70 +70 @@
         ./jenkins/jenkins.sh ./jenkins/ross-debian_linux-binaries-matlab
 
-        if [ $? -ne 0 ]; then
-                echo 'Build failed'
+        if [ $? -ne 0 ]; then 
                 exit 1
         fi
@@ -79 +78 @@
 if [ ${package} -eq 1 ]; then
         ./packagers/linux/package-issm-linux-binaries-matlab.sh $1
+
+        if [ $? -ne 0 ]; then 
+                exit 1
+        fi
 fi
 
@@ -84 +87 @@
 if [ ${transfer} -eq 1 ]; then
         ./packagers/linux/transfer-issm-linux-binaries.sh
+
+        if [ $? -ne 0 ]; then 
+                exit 1
+        fi
 fi
 

issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-python.sh

@@ -70 +70 @@
         ./jenkins/jenkins.sh ./jenkins/ross-debian_linux-binaries-python
 
-        if [ $? -ne 0 ]; then
-                echo 'Build failed'
+        if [ $? -ne 0 ]; then 
                 exit 1
         fi
@@ -79 +78 @@
 if [ ${package} -eq 1 ]; then
         ./packagers/linux/package-issm-linux-binaries-python.sh $1
+
+        if [ $? -ne 0 ]; then 
+                exit 1
+        fi
 fi
 
@@ -84 +87 @@
 if [ ${transfer} -eq 1 ]; then
         ./packagers/linux/transfer-issm-linux-binaries.sh
+
+        if [ $? -ne 0 ]; then 
+                exit 1
+        fi
 fi
 

issm/trunk-jpl/packagers/mac/complete-issm-mac-binaries-matlab.sh

@@ -99 +99 @@
         ./jenkins/jenkins.sh ./jenkins/pine_island-mac-binaries-matlab
 
-        if [ $? -ne 0 ]; then
-                echo 'Build failed'
+        if [ $? -ne 0 ]; then 
                 exit 1
         fi
@@ -109 +108 @@
         ./packagers/mac/package-issm-mac-binaries-matlab.sh $1
         shift # Clear $1 so that it is not passed to commit_for_signing script
+
+        if [ $? -ne 0 ]; then 
+                exit 1
+        fi
 fi
 
@@ -114 +117 @@
 if [ ${sign} -eq 1 ]; then
         ./packagers/mac/commit_for_signing-issm-mac-binaries-matlab.sh $1
+
+        if [ $? -ne 0 ]; then 
+                exit 1
+        fi
 fi
 
@@ -119 +126 @@
 if [ ${transfer} -eq 1 ]; then
         ./packagers/mac/transfer-issm-mac-binaries.sh
+
+        if [ $? -ne 0 ]; then 
+                exit 1
+        fi
 fi
 

issm/trunk-jpl/packagers/mac/complete-issm-mac-binaries-python.sh

@@ -99 +99 @@
         ./jenkins/jenkins.sh ./jenkins/pine_island-mac-binaries-python
 
-        if [ $? -ne 0 ]; then
-                echo 'Build failed'
+        if [ $? -ne 0 ]; then 
                 exit 1
         fi
@@ -109 +108 @@
         ./packagers/mac/package-issm-mac-binaries-python.sh $1
         shift # Clear $1 so that it is not passed to commit_for_signing script
+
+        if [ $? -ne 0 ]; then 
+                exit 1
+        fi
 fi
 
@@ -114 +117 @@
 if [ ${sign} -eq 1 ]; then
         ./packagers/mac/commit_for_signing-issm-mac-binaries-python.sh $1
+
+        if [ $? -ne 0 ]; then 
+                exit 1
+        fi
 fi
 
@@ -119 +126 @@
 if [ ${transfer} -eq 1 ]; then
         ./packagers/mac/transfer-issm-mac-binaries.sh
+
+        if [ $? -ne 0 ]; then 
+                exit 1
+        fi
 fi