X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-ci-jobs.yml;h=f8fdeb811c056a1d729c0672e6a63720d4cd418e;hb=bd5b2d590ab6c5640a3982efc2fb52b1051e9329;hp=d5b99b2a39b223e209fb8733aeac666ebbaaf9ed;hpb=165ef3f47acf63273ab64ee83818487997c18587;p=releng.git

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index d5b99b2a3..f8fdeb811 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -113,6 +113,11 @@
             slave-label: armband-virtual
             installer: fuel
             <<: *colorado
+# netvirt 3rd party ci
+        - virtual:
+            slave-label: odl-netvirt-virtual
+            installer: netvirt
+            <<: *master
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
@@ -128,10 +133,6 @@
             slave-label: '{pod}'
             installer: joid
             <<: *master
-        - huawei-pod2:
-            slave-label: '{pod}'
-            installer: compass
-            <<: *colorado
         - huawei-pod5:
             slave-label: '{pod}'
             installer: compass
@@ -144,6 +145,10 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *master
+        - arm-pod3:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *master
         - zte-pod1:
             slave-label: '{pod}'
             installer: fuel
@@ -168,6 +173,15 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *colorado
+        - arm-pod3:
+            slave-label: '{pod}'
+            installer: fuel
+            <<: *colorado
+# PODs for verify jobs triggered by each patch upload
+        - ool-virtual1:
+            slave-label: '{pod}'
+            installer: apex
+            <<: *master
 #--------------------------------
 
     testsuite:
@@ -205,6 +219,8 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
         - '{installer}-defaults'
         - '{slave-label}-defaults'
         - 'functest-{testsuite}-parameter'
@@ -215,14 +231,15 @@
             name: DOCKER_TAG
             default: '{docker-tag}'
             description: 'Tag to pull docker image'
+        - string:
+            name: CLEAN_DOCKER_IMAGES
+            default: 'false'
+            description: 'Remove downloaded docker images (opnfv/functest:*)'
         - functest-parameter:
             gs-pathname: '{gs-pathname}'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     builders:
         - description-setter:
@@ -271,7 +288,7 @@
         - string:
             name: TESTCASE_OPTIONS
             default: ''
-            description: 'Addtional parameters specific to test case(s)'
+            description: 'Additional parameters specific to test case(s)'
 - parameter:
     name: functest-parameter
     parameters:
@@ -291,6 +308,10 @@
             name: CI_DEBUG
             default: 'false'
             description: "Show debug output information"
+        - string:
+            name: RC_FILE_PATH
+            default: ''
+            description: "Path to the OS credentials file if given"
 ########################
 # trigger macros
 ########################