Merge "do not upload Apex artifacts when daily fails"

diff --combined jjb/apex/apex.yml
index 716e195,60554b3..cb0a0f3
--- 1/jjb/apex/apex.yml
--- 2/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@@ -48,6 -48,10 +48,6 @@@
              refspec: '$GERRIT_REFSPEC'
              choosing-strategy: 'gerrit'
  
 -    wrappers:
 -        - ssh-agent-credentials:
 -            user: '{ssh-credentials}'
 -
      triggers:
          - gerrit:
              trigger-on:
@@@ -111,6 -115,10 +111,6 @@@
              refspec: ''
              choosing-strategy: 'default'
  
 -    wrappers:
 -        - ssh-agent-credentials:
 -            user: '{ssh-credentials}'
 -
      triggers:
          - gerrit:
              trigger-on:
@@@ -171,21 -179,18 +171,21 @@@
              refspec: ''
              branch: '{branch}'
  
 -    wrappers:
 -        - ssh-agent-credentials:
 -            user: '{ssh-credentials}'
 -
      triggers:
          - 'apex-{stream}'
  
      builders:
          - 'apex-build'
-         - 'apex-upload-artifact'
          - 'apex-deploy-virtual'
+         - 'apex-upload-artifact'
          - 'apex-workspace-cleanup'
 +        - trigger-builds:
 +          - project: 'functest-apex-{stream}'
 +            block: true
 +            block-thresholds:
 +                build-step-failure-threshold: 'never'
 +                failure-threshold: 'never'
 +                unstable-threshold: 'FAILURE'
  
  ########################
  # parameter macros
@@@ -312,20 -317,9 +312,9 @@@
              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