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 cfdd2f2..d1e8f26 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -22,9 +22,9 @@
             installer_type: 'compass'
             installer_ip: '192.168.200.2'
         - joid:
-            node: 'intel-us-deploy-bare-pod5'
+            node: 'intel-pod5'
             installer_type: 'compass'
-            installer_ip: '127.0.0.1'            
+            installer_ip: '127.0.0.1'
     pod:
         - orange-test1:
             node: 'orange-test1'
@@ -38,8 +38,8 @@
             node: 'huawei-us-deploy-bare-1'
             installer_type: 'compass'
             installer_ip: '192.168.200.2'
-        - joid-build:
-            node: 'intel-us-deploy-bare-pod5'
+        - intel-pod5:
+            node: 'intel-pod5'
             installer_type: 'joid'
             installer_ip: '127.0.0.1'
 
@@ -77,7 +77,7 @@
 - job-template:
     name: set-functest-env-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - 'set-functest-env'
@@ -85,7 +85,7 @@
 - job-template:
     name: clean-functest-env-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - 'functest-cleanup'
@@ -109,7 +109,7 @@
 - job-template:
     name: functest-openstack-bench-test-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - 'functest-rally-bench'
@@ -117,7 +117,7 @@
 - job-template:
     name: functest-openstack-tempest-smoke-test-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - 'functest-tempest-smoke'
@@ -125,7 +125,7 @@
 - job-template:
     name: functest-odl-test-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - shell: |
@@ -134,7 +134,7 @@
 - job-template:
     name: functest-vping-test-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     builders:
         - 'functest-vping'
@@ -142,7 +142,7 @@
 - job-template:
     name: functest-{pod}
 
-    node: '{pod}'
+    node: '{node}'
 
     parameters:
         - project-parameter:
@@ -306,7 +306,7 @@
 
     builders:
         - shell:
-            !include-raw ../opnfvdocs/docu-build.sh
+            echo "Hello World"
 
 - job-template:
     name: 'functest-merge-{stream}'
@@ -396,12 +396,16 @@
             description: "Override GIT_BASE"
 
 - parameter:
-    name: joid-build
+    name: intel-pod5
     parameters:
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: "Override GIT_BASE"            
+            description: "Override GIT_BASE"
+        - string:
+            name: LAB_CONFIG
+            default: "/home/ubuntu/joid_config/admin-openrc"
+            description: "Openstack credentials on the dev lab"
 
 - parameter:
     name: opnfv-jump-2
@@ -446,8 +450,8 @@
             #!/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"