X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-ci-jobs.yml;h=0d97fef75fdd1dd2db3d0fe3e15028d22044f1a1;hb=7f53c3597432a3c5954f78a54c3f224514a7e729;hp=b70bfc67b8310b78de6219facbeb62896a956a18;hpb=e3d9ba34e99dab52e3e33a6c878b00a9f380c760;p=releng.git

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index b70bfc67b..0d97fef75 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -10,10 +10,10 @@
         stream: master
         branch: '{stream}'
         gs-pathname: ''
-    colorado: &colorado
-        stream: colorado
-        branch: 'stable/{stream}'
-        gs-pathname: '/{stream}'
+#    colorado: &colorado
+#        stream: colorado
+#        branch: 'stable/{stream}'
+#        gs-pathname: '/{stream}'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
@@ -28,14 +28,14 @@
             slave-label: compass-virtual
             os-version: 'trusty'
             <<: *master
-        - baremetal:
-            slave-label: compass-baremetal
-            os-version: 'trusty'
-            <<: *colorado
-        - virtual:
-            slave-label: compass-virtual
-            os-version: 'trusty'
-            <<: *colorado
+#        - baremetal:
+#            slave-label: compass-baremetal
+#            os-version: 'trusty'
+#            <<: *colorado
+#        - virtual:
+#            slave-label: compass-virtual
+#            os-version: 'trusty'
+#            <<: *colorado
 #--------------------------------
 #        master
 #--------------------------------
@@ -48,35 +48,27 @@
         - 'os-nosdn-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-            openstack-os-version: ''
         - 'os-odl_l2-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-            openstack-os-version: ''
         - 'os-odl_l3-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-            openstack-os-version: ''
         - 'os-onos-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-            openstack-os-version: ''
         - 'os-ocl-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-            openstack-os-version: ''
         - 'os-onos-sfc-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-            openstack-os-version: ''
         - 'os-odl_l2-moon-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-            openstack-os-version: 'xenial'
         - 'os-nosdn-kvm-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-            openstack-os-version: ''
 
     jobs:
         - 'compass-{scenario}-{pod}-daily-{stream}'
@@ -131,7 +123,6 @@
               predefined-parameters: |
                 DEPLOY_SCENARIO={scenario}
                 COMPASS_OS_VERSION={os-version}
-                COMPASS_OS_VERSION_OPTION={openstack-os-version}
               same-node: true
               block: true
         - trigger-builds:
@@ -159,7 +150,7 @@
         #dovetail only master by now, not sync with A/B/C branches
         #here the stream means the SUT stream, dovetail stream is defined in its own job
         - trigger-builds:
-            - project: 'dovetail-compass-{pod}-basic-{stream}'
+            - project: 'dovetail-compass-{pod}-debug-{stream}'
               current-parameters: false
               predefined-parameters:
                 DEPLOY_SCENARIO={scenario}
@@ -250,11 +241,6 @@
                 - 'mitaka'
                 - 'newton'
                 - 'liberty'
-        - choice:
-            name: COMPASS_OS_VERSION_OPTION
-            choices:
-                - ''
-                - 'xenial'
 
 ########################
 # trigger macros