Cleanup functest.yml

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

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 2c8d011..90418db 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)
@@ -24,12 +24,6 @@
 
     node: opnfv-jump-1
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
@@ -91,6 +85,8 @@
 
     node: opnfv-jump-1
 
+    disabled: true
+
     parameters:
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
@@ -162,9 +158,6 @@
             refspec: ''
             branch: '{branch}'
 
-    triggers:
-        - 'apex-{stream}'
-
     builders:
         - 'apex-build'
         - 'apex-deploy-virtual'
@@ -172,7 +165,7 @@
         - 'apex-workspace-cleanup'
 
 - job-template:
-    name: 'apex-virtual-deploy-{stream}'
+    name: 'apex-deploy-virtual-{stream}'
 
     # Job template for virtual deployment
     #
@@ -183,6 +176,12 @@
 
     disabled: false
 
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
     parameters:
         - project-parameter:
             project: '{project}'
@@ -195,7 +194,7 @@
         - 'apex-workspace-cleanup'
 
 - job-template:
-    name: 'apex-baremetal-deploy-{stream}'
+    name: 'apex-deploy-baremetal-{stream}'
 
     # Job template for baremetal deployment
     #
@@ -206,6 +205,12 @@
 
     disabled: true
 
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
     parameters:
         - project-parameter:
             project: '{project}'
@@ -228,6 +233,12 @@
 
     disabled: false
 
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
     parameters:
         - project-parameter:
             project: '{project}'
@@ -240,19 +251,23 @@
             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}'
+          - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
             block: true
             block-thresholds:
                 build-step-failure-threshold: 'never'
@@ -267,7 +282,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 +403,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
@@ -405,7 +420,7 @@
                     [[ -f opnfv.properties ]] || exit 1
                     # source the file so we get OPNFV vars
                     source opnfv.properties
-                    RPM_INSTALL_PATH=$RPM_URL
+                    RPM_INSTALL_PATH=$OPNFV_RPM_URL
                 fi
             fi