Merge "jjb: move project-style to releng-defaults.yaml"

[releng.git] / jjb / apex / apex.yml

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 376515b..f920c9b 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -21,8 +21,6 @@
 
     node: opnfv-jump-1
 
-    project-type: freestyle
-
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -48,10 +46,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -88,8 +82,6 @@
 
     node: opnfv-jump-1
 
-    project-type: freestyle
-
     logrotate:
         daysToKeep: 30
         numToKeep: 40
@@ -115,10 +107,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -152,8 +140,6 @@
 
     disabled: false
 
-    project-type: freestyle
-
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
@@ -179,18 +165,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
@@ -317,20 +306,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