Merge "Apex, Functest: Enable smoke tests on Apex master verify"

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index ce60ed3..b48e81e 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -220,6 +220,12 @@
               OPNFV_CLEAN=yes
             git-revision: false
             block: true
+        - trigger-builds:
+          - project: 'functest-apex-{slave}-suite-{stream1}'
+            predefined-parameters: |
+              DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+              FUNCTEST_SUITE_NAME=vping_userdata
+            block: true
         - 'apex-workspace-cleanup'
 
 - job-template:

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 57f4810..af79fbf 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -67,7 +67,7 @@
         - intel-pod8:
             installer: compass
             <<: *master
-        - opnfv-jump-1:
+        - intel-pod7:
             installer: apex
             <<: *master
         - ericsson-pod1:
@@ -172,7 +172,8 @@
                 - 'promise'
                 - 'doctor'
                 - 'vims'
-                - 'vping'
+                - 'vping_userdata'
+                - 'vping_ssh'
 - parameter:
     name: functest-parameter
     parameters:

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 8ee4b0b..e7f063c 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -174,6 +174,29 @@
             default: ext-net;flat;10.6.15.5;10.6.15.250;10.6.15.254;10.6.15.0/24
             description: "External network to create for pod6 (name;type;first ip;last ip; gateway;network)"
 
+- parameter:
+    name: 'intel-pod7-defaults'
+    parameters:
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - intel-pod7
+            default-slaves:
+                - intel-pod7
+        - string:
+            name: INSTALLER_VERSION
+            default: latest
+            description: 'Version of the installer to deploy'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
+        - string:
+            name: SSH_KEY
+            default: /root/.ssh/id_rsa
+            description: 'SSH key to use for Apex'
+
 - parameter:
     name: 'intel-pod8-defaults'
     parameters: