X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdovetail%2Fdovetail-ci-jobs.yml;h=08eb5a5f1e3b76f186f502059577f38a9794ccfc;hb=0de7c95e85e1eb73879eed69d017769229e8127f;hp=9d2f69da9bc22507baada89b75a9562ba397342c;hpb=50f5122ab09ab0cbca792e853232adc6b5dae168;p=releng.git

diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 9d2f69da9..08eb5a5f1 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -17,12 +17,14 @@
     master: &master
         stream: master
         branch: '{stream}'
+        dovetail-branch: '{stream}'
         gs-pathname: ''
         docker-tag: 'latest'
     colorado: &colorado
         stream: colorado
         branch: 'stable/{stream}'
-        gs-pathname: '{stream}'
+        dovetail-branch: master
+        gs-pathname: '/{stream}'
         docker-tag: 'latest'
 
 #-----------------------------------
@@ -79,6 +81,48 @@
             SUT: compass
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *colorado
+#apex CI PODs
+        - apex-verify-master:
+            slave-label: '{pod}'
+            SUT: apex
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - apex-daily-master:
+            slave-label: '{pod}'
+            SUT: apex
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - apex-verify-colorado:
+            slave-label: '{pod}'
+            SUT: apex
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *colorado
+        - apex-daily-colorado:
+            slave-label: '{pod}'
+            SUT: apex
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *colorado
+#armband CI PODs
+        - armband-baremetal:
+            slave-label: armband-baremetal
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - armband-virtual:
+            slave-label: armband-virtual
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - armband-baremetal:
+            slave-label: armband-baremetal
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *colorado
+        - armband-virtual:
+            slave-label: armband-virtual
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *colorado
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
@@ -87,9 +131,21 @@
             SUT: compass
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
+        - arm-pod2:
+            slave-label: '{pod}'
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - arm-pod3:
+            slave-label: '{pod}'
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
 #--------------------------------
     testsuite:
-        - 'basic'
+        - 'debug'
+        - 'proposed_tests'
+        - 'compliance_set'
 
     jobs:
         - 'dovetail-{SUT}-{pod}-{testsuite}-{stream}'
@@ -123,6 +179,8 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
         - '{SUT}-defaults'
         - '{slave-label}-defaults'
         - string:
@@ -131,23 +189,28 @@
         - string:
             name: DOCKER_TAG
             default: '{docker-tag}'
-            description: 'Tag to pull docker image'
+            description: 'Tag to pull dovetail docker image'
         - string:
             name: CI_DEBUG
             default: 'true'
             description: "Show debug output information"
+        - string:
+            name: TESTSUITE
+            default: '{testsuite}'
+            description: "dovetail testsuite to run"
+        - string:
+            name: DOVETAIL_REPO_DIR
+            default: "/home/opnfv/dovetail"
+            description: "Directory where the dovetail repository is cloned"
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     builders:
         - description-setter:
             description: "POD: $NODE_NAME"
         - 'dovetail-cleanup'
-        - 'dovetail-{testsuite}'
+        - 'dovetail-run'
 
     publishers:
         - archive:
@@ -159,17 +222,11 @@
 # builder macros
 ########################
 - builder:
-    name: dovetail-basic
+    name: dovetail-run
     builders:
         - shell:
             !include-raw: ./dovetail-run.sh
 
-- builder:
-    name: dovetail-fetch-os-creds
-    builders:
-        - shell:
-            !include-raw: ../../utils/fetch_os_creds.sh
-
 - builder:
     name: dovetail-cleanup
     builders: