add joid POD in functest

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

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 4223e67..4b37db2 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -18,19 +18,30 @@
             installer_type: 'apex'
             installer_ip: '192.168.X.X'
         - compass:
-            node: 'huawei-us'
+            node: 'huawei-us-deploy-bare-1'
             installer_type: 'compass'
             installer_ip: '192.168.200.2'
+        - joid:
+            node: 'intel-us-deploy-bare-pod5'
+            installer_type: 'compass'
+            installer_ip: '127.0.0.1'            
     pod:
         - orange-test1:
             node: 'orange-test1'
             installer_type: 'fuel'
             installer_ip: '172.30.10.73'
-
         - orange-fr-pod2:
             node: 'orange-fr-pod2'
             installer_type: 'joid'
             installer_ip: '127.0.0.1'
+        - huawei-build:
+            node: 'huawei-us-deploy-bare-1'
+            installer_type: 'compass'
+            installer_ip: '192.168.200.2'
+        - joid-build:
+            node: 'intel-us-deploy-bare-pod5'
+            installer_type: 'joid'
+            installer_ip: '127.0.0.1'
 
     jobs:
         - 'set-functest-env-{pod}'
@@ -376,6 +387,22 @@
             default: ssh://gerrit.opnfv.org:29418/$PROJECT
             description: "Override GIT_BASE"
 
+- parameter:
+    name: huawei-build
+    parameters:
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: "Override GIT_BASE"
+
+- parameter:
+    name: joid-build
+    parameters:
+        - string:
+            name: GIT_BASE
+            default: ssh://gerrit.opnfv.org:29418/$PROJECT
+            description: "Override GIT_BASE"            
+
 - parameter:
     name: opnfv-jump-2
     parameters:
@@ -421,6 +448,7 @@
             if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
                 INSTALLER_IP=$(cat instack /var/lib/libvirt/dnsmasq/default.leases \
                     |sed 's/.*192/192/g' | sed 's/\ in.*//g')
+                sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
             fi
             echo "Functest: Start Docker and prepare environment"
             envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}"
@@ -430,8 +458,9 @@
             if [ -n "${LAB_CONFIG}" ]; then
                 labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds"
             fi
+
             docker pull opnfv/functest:latest_stable
-            cmd="docker run -id -e $envs ${labconfig} opnfv/functest:latest_stable /bin/bash"
+            cmd="docker run -id -e $envs ${labconfig} ${sshkey} opnfv/functest:latest_stable /bin/bash"
             echo "Functest: Running docker run command: ${cmd}"
             ${cmd}
             docker ps -a