summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2015-11-30 17:19:36 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-11-30 17:19:36 +0000
commit99461785a9fa5541177db93b9a3e2e0c94dd75b7 (patch)
tree05e21581c523b7e0020b62b26df83d6efa8d59c3 /jjb
parent677b590f48dbea2788f5c090ed52fd3f7d1ee957 (diff)
parent40a28d5110a9a0b3d913b23c49f46269254f7aa8 (diff)
Merge "do not upload Apex artifacts when daily fails"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex.yml19
1 files changed, 4 insertions, 15 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 716e1954b..cb0a0f369 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -176,8 +176,8 @@
builders:
- 'apex-build'
- - 'apex-upload-artifact'
- 'apex-deploy-virtual'
+ - 'apex-upload-artifact'
- 'apex-workspace-cleanup'
- trigger-builds:
- project: 'functest-apex-{stream}'
@@ -312,20 +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