moving Apex timer trigger off build to daily job

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

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 2c8d011..24fa4b1 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -4,8 +4,8 @@
         - 'apex-verify-{stream}'
         - 'apex-merge-{stream}'
         - 'apex-build-{stream}'
-        - 'apex-virtual-deploy-{stream}'
-        - 'apex-baremetal-deploy-{stream}'
+        - 'apex-deploy-virtual-{stream}'
+        - 'apex-deploy-baremetal-{stream}'
         - 'apex-daily-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-arno)
@@ -91,6 +91,8 @@
 
     node: opnfv-jump-1
 
+    disabled: true
+
     parameters:
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
@@ -162,9 +164,6 @@
             refspec: ''
             branch: '{branch}'
 
-    triggers:
-        - 'apex-{stream}'
-
     builders:
         - 'apex-build'
         - 'apex-deploy-virtual'
@@ -172,7 +171,7 @@
         - 'apex-workspace-cleanup'
 
 - job-template:
-    name: 'apex-virtual-deploy-{stream}'
+    name: 'apex-deploy-virtual-{stream}'
 
     # Job template for virtual deployment
     #
@@ -195,7 +194,7 @@
         - 'apex-workspace-cleanup'
 
 - job-template:
-    name: 'apex-baremetal-deploy-{stream}'
+    name: 'apex-deploy-baremetal-{stream}'
 
     # Job template for baremetal deployment
     #
@@ -240,17 +239,21 @@
             use-build-blocker: true
             blocking-jobs:
                 - "apex-daily.*"
+
+    triggers:
+        - 'apex-{stream}'
+
     builders:
         - trigger-builds:
           - project: 'apex-build-{stream}'
             git-revision: true
             block: true
         - trigger-builds:
-          - project: 'apex-virtual-deploy-{stream}'
+          - project: 'apex-deploy-virtual-{stream}'
             git-revision: true
             block: true
         - trigger-builds:
-          - project: 'apex-baremetal-deploy-{stream}'
+          - project: 'apex-deploy-baremetal-{stream}'
         - trigger-builds:
           - project: 'functest-apex-{stream}'
             block: true
@@ -267,7 +270,7 @@
     parameters:
         - string:
             name: ARTIFACT_NAME
-            default: ''
+            default: 'latest'
             description: "RPM Artifact name that will be appended to GS_URL to deploy a specific artifact"
         - string:
             name: BUILD_DIRECTORY
@@ -388,7 +391,7 @@
             echo "--------------------------------------------------------"
             echo
 
-            if [[ -z "$ARTIFACT_NAME" ]]; then
+            if [[ ! "$ARTIFACT_NAME" == "latest" ]]; then
                 # if artifact name is passed the pull a
                 # specific artifact from artifacts.opnfv.org
                 RPM_INSTALL_PATH=$GS_URL/$ARTIFACT_NAME