X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yml;h=aa0426a20067008a31fe067f5e169e4ba0f8a6cc;hb=26274677675106795394f3b8ca8ecb77b7a37922;hp=47024e20e76a6aa59176db61dfde6cd67c6044c0;hpb=99461785a9fa5541177db93b9a3e2e0c94dd75b7;p=releng.git

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 47024e20e..aa0426a20 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -17,11 +17,31 @@
             node: 'opnfv-jump-1'
             installer_type: 'apex'
             installer_ip: '192.168.X.X'
+        - compass:
+            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-build:
-            node: 'orange-build'
-            installer_type: 'foreman'
+        - 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-us-deploy-bare-pod5:
+            node: 'intel-us-deploy-bare-pod5'
+            installer_type: 'joid'
+            installer_ip: '127.0.0.1'
 
     jobs:
         - 'set-functest-env-{pod}'
@@ -57,100 +77,47 @@
 - job-template:
     name: set-functest-env-{pod}
 
-    project-type: freestyle
-
-    node: '{pod}'
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    node: '{node}'
 
     builders:
         - 'set-functest-env'
 
-
-
 - job-template:
     name: clean-functest-env-{pod}
 
-    project-type: freestyle
-
-    node: '{pod}'
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    node: '{node}'
 
     builders:
         - 'functest-cleanup'
 
-
 - job-template:
     name: set-functest-env-{installer}-{stream}
 
-    project-type: freestyle
-
     node: '{node}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'set-functest-env'
 
-
 - job-template:
     name: clean-functest-env-{installer}-{stream}
 
-    project-type: freestyle
-
     node: '{node}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'functest-cleanup'
 
 - job-template:
     name: functest-openstack-bench-test-{pod}
 
-    project-type: freestyle
-
-    node: '{pod}'
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    node: '{node}'
 
     builders:
         - 'functest-rally-bench'
 
-
 - job-template:
     name: functest-openstack-tempest-smoke-test-{pod}
 
-    project-type: freestyle
-
-    node: '{pod}'
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    node: '{node}'
 
     builders:
         - 'functest-tempest-smoke'
@@ -158,44 +125,24 @@
 - job-template:
     name: functest-odl-test-{pod}
 
-    project-type: freestyle
-
-    node: '{pod}'
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    node: '{node}'
 
     builders:
         - shell: |
         - 'functest-odl'
 
-
 - job-template:
     name: functest-vping-test-{pod}
 
-    project-type: freestyle
-
-    node: '{pod}'
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    node: '{node}'
 
     builders:
         - 'functest-vping'
 
-
 - job-template:
     name: functest-{pod}
 
-    project-type: freestyle
-
-    node: '{pod}'
+    node: '{node}'
 
     parameters:
         - project-parameter:
@@ -217,12 +164,6 @@
             refspec: ''
             branch: master
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'functest-cleanup'
         - 'set-functest-env'
@@ -232,8 +173,6 @@
 - job-template:
     name: functest-{installer}-{stream}
 
-    project-type: freestyle
-
     node: '{node}'
 
     parameters:
@@ -259,12 +198,6 @@
             refspec: ''
             branch: master
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'functest-cleanup'
         - 'set-functest-env'
@@ -274,8 +207,6 @@
 - job-template:
     name: functest-vims-{installer}-{stream}
 
-    project-type: freestyle
-
     node: '{node}'
 
     parameters:
@@ -301,35 +232,20 @@
             refspec: ''
             branch: master
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'functest-vims'
 
 - job-template:
     name: 'functest-daily-{stream}'
 
-    node: master
-
     # Job template for daily builders
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
 
-    project-type: freestyle
     varsetabove: '{somevar}'
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -358,16 +274,6 @@
 - job-template:
     name: 'functest-verify-{stream}'
 
-    node: master
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -400,25 +306,15 @@
 
     builders:
         - shell:
-            !include-raw ../opnfvdocs/docu-build.sh
+            echo "Hello World"
 
 - job-template:
     name: 'functest-merge-{stream}'
 
-    node: master
-
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB
 
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -464,13 +360,25 @@
             description: "Directory where the Functest repository is cloned"
 
 - parameter:
-    name: orange-build
+    name: orange-test1
     parameters:
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: "Override GIT_BASE"
 
+- parameter:
+    name: orange-fr-pod2
+    parameters:
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: "Override GIT_BASE"
+        - string:
+            name: LAB_CONFIG
+            default: "/home/opnfv/repos/functest"
+            description: "Openstack credentials on the dev lab"
+
 - parameter:
     name: opnfv-jump-1
     parameters:
@@ -479,6 +387,26 @@
             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-us-deploy-bare-pod5
+    parameters:
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            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
     parameters:
@@ -515,7 +443,6 @@
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
 
-
 - builder:
     name: set-functest-env
     builders:
@@ -523,17 +450,26 @@
             #!/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}"
+            envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}"
+            labconfig=""
+            # If production lab then creds may be retrieved dynamically
+            # If dev lab, credentials may not be the default ones, just provide a path to put them into docker
+            if [ -n "${LAB_CONFIG}" ]; then
+                labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds"
+            fi
+
             docker pull opnfv/functest:latest_stable
-            echo "Functest: Running docker run command: docker run -i -e $envs opnfv/functest /bin/bash &"
-            docker run -i -e $envs opnfv/functest /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
             sleep 5
-            container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
+            container_id=$(docker ps | grep 'opnfv/functest:latest_stable' | awk '{print $1}' | head -1)
             echo "Container ID=${container_id}"
             if [ -z ${container_id} ]; then
                 echo "Cannot find opnfv/functest container ID ${container_id}. Please check if it is existing."
@@ -544,7 +480,7 @@
             docker start ${container_id}
             sleep 5
             docker ps
-            if [ $(docker ps | grep opnfv/functest | wc -l) == 0 ]; then
+            if [ $(docker ps | grep 'opnfv/functest:latest_stable' | wc -l) == 0 ]; then
                 echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
                 exit 1
             fi
@@ -552,7 +488,6 @@
             echo "Executing command inside the docker: ${cmd}"
             docker exec ${container_id} ${cmd}
 
-
 - builder:
     name: functest-vping
     builders:
@@ -590,8 +525,6 @@
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
 
-
-
 - builder:
     name: functest-rally-bench
     builders:
@@ -604,7 +537,6 @@
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
 
-
 - builder:
     name: functest-vims
     builders:
@@ -617,8 +549,6 @@
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
 
-
-
 - builder:
     name: functest-store-results
     builders:
@@ -640,7 +570,6 @@
                 docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm
             fi
 
-
             # Remove existing images if exist
             if [[ ! -z $(docker images | grep opnfv/functest) ]]; then
                 echo "Docker images to remove:"