X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Ffunctest%2Ffunctest-ci-jobs.yml;h=10ea72b5310919af98145b21909accfbb17b8a9e;hb=c191f55927899a0d436e5deaa723a18b894113dc;hp=49d29cbbec1dc880fb2279c232711b553344618f;hpb=ca667bbdceff583e2fd25b311bc63e12a88ae335;p=releng.git

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 49d29cbbe..10ea72b53 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -32,6 +32,18 @@
         - huawei-us-deploy-bare-1:
             installer: compass
             <<: *brahmaputra
+        - ericsson-pod1:
+            installer: fuel
+            <<: *brahmaputra
+        - virtual:
+            installer: fuel
+            <<: *brahmaputra
+        - huawei-virtual:
+            installer: compass
+            <<: *brahmaputra
+        - virtual:
+            installer: joid
+            <<: *brahmaputra
 #--------------------------------
 #        master
 #--------------------------------
@@ -56,6 +68,15 @@
         - orange-pod2:
             installer: joid
             <<: *master
+        - virtual:
+            installer: fuel
+            <<: *master
+        - huawei-virtual:
+            installer: compass
+            <<: *master
+        - virtual:
+            installer: joid
+            <<: *master
 #--------------------------------
 
     testsuite:
@@ -81,6 +102,9 @@
         - '{pod}-defaults'
         - '{installer}-defaults'
         - 'functest-{testsuite}-parameter'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
         - functest-parameter:
             gs-pathname: '{gs-pathname}'
 
@@ -112,6 +136,10 @@
                 - 'tempest'
                 - 'rally'
                 - 'odl'
+                - 'onos'
+                - 'ovno'
+                - 'promise'
+                - 'doctor'
                 - 'vims'
                 - 'vping'
 - parameter:
@@ -215,13 +243,13 @@
             sudo rm -rf ${dir_result}/*
             res_volume="-v ${dir_result}:/home/opnfv/functest/results"
 
-            docker pull opnfv/functest:latest_stable >$redirect
-            cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest_stable /bin/bash"
+            docker pull opnfv/functest:latest >$redirect
+            cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest /bin/bash"
             echo "Functest: Running docker run command: ${cmd}"
             ${cmd}
             docker ps -a
             sleep 5
-            container_id=$(docker ps | grep 'opnfv/functest:latest_stable' | awk '{print $1}' | head -1)
+            container_id=$(docker ps | grep 'opnfv/functest:latest' | 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."
@@ -232,7 +260,7 @@
             docker start ${container_id}
             sleep 5
             docker ps
-            if [ $(docker ps | grep 'opnfv/functest:latest_stable' | wc -l) == 0 ]; then
+            if [ $(docker ps | grep 'opnfv/functest:latest' | wc -l) == 0 ]; then
                 echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
                 exit 1
             fi