do not upload Apex artifacts when daily fails

Change-Id: Id2a4beef1f404d383d081d50d3fca7139659ea95
Signed-off-by: Dan Radez <dradez@redhat.com>

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 376515b..60554b3 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -188,8 +188,8 @@
 
     builders:
         - 'apex-build'
 
     builders:
         - 'apex-build'

-        - 'apex-upload-artifact'

         - 'apex-deploy-virtual'
         - 'apex-deploy-virtual'

+        - 'apex-upload-artifact'

         - 'apex-workspace-cleanup'
 
 ########################
         - 'apex-workspace-cleanup'
 
 ########################


@@ -317,20 +317,9 @@
             echo "--------------------------------------------------------"
             echo
 
             echo "--------------------------------------------------------"
             echo
 

-            # check if we got the file
-            if [[ -f opnfv.properties ]]; then
-                # source the file so we get OPNFV vars
-                source opnfv.properties
-                RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL)
-            else
-                # get the latest.properties file in order to get info regarding latest artifact
-                curl -s -o $WORKSPACE/opnfv.properties http://$GS_URL/latest.properties
-                [[ -f opnfv.properties ]] || exit 1
-
-                # source the file so we get OPNFV vars
-                source opnfv.properties
-                RPM_INSTALL_PATH=$RPM_URL
-            fi
+            # source the file so we get OPNFV vars
+            source opnfv.properties
+            RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL)

 
             # update / install the new rpm
             if rpm -q opnfv-apex > /dev/null; then
 
             # update / install the new rpm
             if rpm -q opnfv-apex > /dev/null; then