Merge "Update script to push rally html pages in artifacts"

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

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index e76fe52..d1e8f26 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-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'
+        - intel-pod5:
+            node: 'intel-pod5'
+            installer_type: 'joid'
+            installer_ip: '127.0.0.1'
 
     jobs:
         - 'set-functest-env-{pod}'
@@ -66,7 +77,7 @@
 - job-template:
     name: set-functest-env-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - 'set-functest-env'
@@ -74,7 +85,7 @@
 - job-template:
     name: clean-functest-env-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - 'functest-cleanup'
@@ -98,7 +109,7 @@
 - job-template:
     name: functest-openstack-bench-test-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - 'functest-rally-bench'
@@ -106,7 +117,7 @@
 - job-template:
     name: functest-openstack-tempest-smoke-test-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - 'functest-tempest-smoke'
@@ -114,7 +125,7 @@
 - job-template:
     name: functest-odl-test-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - shell: |
@@ -123,7 +134,7 @@
 - job-template:
     name: functest-vping-test-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - 'functest-vping'
@@ -131,7 +142,7 @@
 - job-template:
     name: functest-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     parameters:
         - project-parameter:
@@ -295,7 +306,7 @@
 
     builders:
         - shell:
-            !include-raw ../opnfvdocs/docu-build.sh
+            echo "Hello World"
 
 - job-template:
     name: 'functest-merge-{stream}'
@@ -375,10 +386,26 @@
             name: GIT_BASE
             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: intel-pod5
+    parameters:
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: "Override GIT_BASE"
         - string:
-            name: SSH_KEY
-            default: "/root/.ssh/id_rsa"
-            description: "SSH public key to access the installer VM"
+            name: LAB_CONFIG
+            default: "/home/ubuntu/joid_config/admin-openrc"
+            description: "Openstack credentials on the dev lab"
 
 - parameter:
     name: opnfv-jump-2
@@ -423,8 +450,9 @@
             #!/bin/bash
             set +e
             if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
-                INSTALLER_IP=$(cat instack /var/lib/libvirt/dnsmasq/default.leases \
-                    |sed 's/.*192/192/g' | sed 's/\ in.*//g')
+                INSTALLER_IP=$(grep instack /var/lib/libvirt/dnsmasq/default.leases \
+                    |awk '{print $3}' | head -n 1)
+                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}"
@@ -434,9 +462,6 @@
             if [ -n "${LAB_CONFIG}" ]; then
                 labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds"
             fi
-            if [ -n "${SSH_KEY}" ]; then
-                sshkey="-v ${SSH_KEY}:/root/.ssh/id_rsa"
-            fi
 
             docker pull opnfv/functest:latest_stable
             cmd="docker run -id -e $envs ${labconfig} ${sshkey} opnfv/functest:latest_stable /bin/bash"