Remove colorado jobs and create danube jobs

Danube stream for the projects with daily jobs is disabled.
Danube stream for the projects without daily jobs is left as enabled
as there will be no changes coming to danube branch until branch is created.

Dovetail, Apex and Fuel jobs have not been updated yet.

Change-Id: Ice39826c8f829157fa864370557837290838f634
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 22e1daf..62f2a1a 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -10,26 +10,28 @@
         stream: master
         branch: '{stream}'
         gs-pathname: ''
-    colorado: &colorado
-        stream: colorado
+        disabled: false
+    danube: &danube
+        stream: danube
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
+        disabled: true
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
 # CI POD's
 #--------------------------------
-#        colorado
+#        danube
 #--------------------------------
     pod:
         - armband-baremetal:
             slave-label: armband-baremetal
             installer: fuel
-            <<: *colorado
+            <<: *danube
         - armband-virtual:
             slave-label: armband-virtual
             installer: fuel
-            <<: *colorado
+            <<: *danube
 #--------------------------------
 #        master
 #--------------------------------
@@ -44,16 +46,16 @@
 #--------------------------------
 # NONE-CI POD's
 #--------------------------------
-#        colorado
+#        danube
 #--------------------------------
         - arm-pod2:
             slave-label: arm-pod2
             installer: fuel
-            <<: *colorado
+            <<: *danube
         - arm-pod3:
             slave-label: arm-pod3
             installer: fuel
-            <<: *colorado
+            <<: *danube
 #--------------------------------
 #        master
 #--------------------------------
@@ -97,6 +99,8 @@
 - job-template:
     name: '{installer}-{scenario}-{pod}-daily-{stream}'
 
+    disabled: '{obj:disabled}'
+
     concurrent: false
 
     properties:
@@ -283,34 +287,34 @@
         - timed: '0 0 * * 7'
 
 #----------------------------------------------------------------------
-# Enea Armband CI Baremetal Triggers running against colorado branch
+# Enea Armband CI Baremetal Triggers running against danube branch
 #----------------------------------------------------------------------
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-armband-baremetal-colorado-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-armband-baremetal-danube-trigger'
     triggers:
         - timed: '0 8 * * 1,3,5,7'
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-colorado-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-danube-trigger'
     triggers:
         - timed: '0 16 * * 2,7'
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-armband-baremetal-colorado-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-armband-baremetal-danube-trigger'
     triggers:
         - timed: '0 8 * * 2,4,6'
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-colorado-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-danube-trigger'
     triggers:
         - timed: '0 16 * * 1,4,6'
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-colorado-trigger'
+    name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-danube-trigger'
     triggers:
         - timed: '0 16 * * 3,5'
 - trigger:
-    name: 'fuel-os-odl_l2-sfc-ha-armband-baremetal-colorado-trigger'
+    name: 'fuel-os-odl_l2-sfc-ha-armband-baremetal-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-sfc-noha-armband-baremetal-colorado-trigger'
+    name: 'fuel-os-odl_l2-sfc-noha-armband-baremetal-danube-trigger'
     triggers:
         - timed: ''
 #---------------------------------------------------------------
@@ -345,34 +349,34 @@
     triggers:
         - timed: '0 2 * * 7'
 #--------------------------------------------------------------------
-# Enea Armband CI Virtual Triggers running against colorado branch
+# Enea Armband CI Virtual Triggers running against danube branch
 #--------------------------------------------------------------------
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-armband-virtual-colorado-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-armband-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-colorado-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-armband-virtual-colorado-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-armband-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-armband-virtual-colorado-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-armband-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-noha-armband-virtual-colorado-trigger'
+    name: 'fuel-os-odl_l2-nofeature-noha-armband-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-sfc-ha-armband-virtual-colorado-trigger'
+    name: 'fuel-os-odl_l2-sfc-ha-armband-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-sfc-noha-armband-virtual-colorado-trigger'
+    name: 'fuel-os-odl_l2-sfc-noha-armband-virtual-danube-trigger'
     triggers:
         - timed: ''
 #----------------------------------------------------------
@@ -407,34 +411,34 @@
     triggers:
         - timed: ''
 #---------------------------------------------------------------
-# Enea Armband POD 2 Triggers running against colorado branch
+# Enea Armband POD 2 Triggers running against danube branch
 #---------------------------------------------------------------
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-arm-pod2-colorado-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-arm-pod2-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-arm-pod2-colorado-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-arm-pod2-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-arm-pod2-colorado-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-arm-pod2-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod2-colorado-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod2-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-noha-arm-pod2-colorado-trigger'
+    name: 'fuel-os-odl_l2-nofeature-noha-arm-pod2-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-sfc-ha-arm-pod2-colorado-trigger'
+    name: 'fuel-os-odl_l2-sfc-ha-arm-pod2-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-sfc-noha-arm-pod2-colorado-trigger'
+    name: 'fuel-os-odl_l2-sfc-noha-arm-pod2-danube-trigger'
     triggers:
         - timed: ''
 #----------------------------------------------------------
@@ -469,33 +473,33 @@
     triggers:
         - timed: ''
 #---------------------------------------------------------------
-# Enea Armband POD 3 Triggers running against colorado branch
+# Enea Armband POD 3 Triggers running against danube branch
 #---------------------------------------------------------------
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-arm-pod3-colorado-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-arm-pod3-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-arm-pod3-colorado-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-arm-pod3-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-arm-pod3-colorado-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-arm-pod3-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod3-colorado-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod3-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-noha-arm-pod3-colorado-trigger'
+    name: 'fuel-os-odl_l2-nofeature-noha-arm-pod3-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-sfc-ha-arm-pod3-colorado-trigger'
+    name: 'fuel-os-odl_l2-sfc-ha-arm-pod3-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-sfc-noha-arm-pod3-colorado-trigger'
+    name: 'fuel-os-odl_l2-sfc-noha-arm-pod3-danube-trigger'
     triggers:
         - timed: ''

diff --git a/jjb/armband/armband-project-jobs.yml b/jjb/armband/armband-project-jobs.yml
index e3853fa..981f509 100644 (file)
--- a/jjb/armband/armband-project-jobs.yml
+++ b/jjb/armband/armband-project-jobs.yml
@@ -16,13 +16,17 @@
         - master:
             branch: '{stream}'
             gs-pathname: ''
-        - colorado:
+            disabled: false
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
+            disabled: true
 
 - job-template:
     name: 'armband-{installer}-build-daily-{stream}'
 
+    disabled: '{obj:disabled}'
+
     concurrent: false
 
     properties:

diff --git a/jjb/armband/armband-verify-jobs.yml b/jjb/armband/armband-verify-jobs.yml
index 9bfe4f4..d5333eb 100644 (file)
--- a/jjb/armband/armband-verify-jobs.yml
+++ b/jjb/armband/armband-verify-jobs.yml
@@ -12,7 +12,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false

diff --git a/jjb/availability/availability.yml b/jjb/availability/availability.yml
index ae9f163..c3603a6 100644 (file)
--- a/jjb/availability/availability.yml
+++ b/jjb/availability/availability.yml
@@ -15,7 +15,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: 'false'
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: 'false'

diff --git a/jjb/barometer/barometer.yml b/jjb/barometer/barometer.yml
index 4afe40e..27e1f83 100644 (file)
--- a/jjb/barometer/barometer.yml
+++ b/jjb/barometer/barometer.yml
@@ -17,10 +17,10 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: false
+            disabled: true
 
 - job-template:
     name: 'barometer-verify-{stream}'

diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index 0054ddd..92ec2d8 100644 (file)
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -18,8 +18,8 @@
         gs-packagepath: '/{suite}'
         #docker tag used for version control
         docker-tag: 'latest'
-    colorado: &colorado
-        stream: colorado
+    danube: &danube
+        stream: danube
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
         gs-packagepath: '/{stream}/{suite}'
@@ -48,12 +48,12 @@
             slave-label: compass-baremetal
             installer: compass
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
         - virtual:
             slave-label: compass-virtual
             installer: compass
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
 
 #--------------------------------
 #        None-CI PODs
@@ -62,7 +62,7 @@
        #     slave-label: '{pod}'
        #     installer: joid
        #     auto-trigger-name: 'daily-trigger-disabled'
-       #     <<: *colorado
+       #     <<: *danube
        # - orange-pod2:
        #     slave-label: '{pod}'
        #     installer: joid

diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml
index a461c6a..03e40dc 100644 (file)
--- a/jjb/bottlenecks/bottlenecks-project-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml
@@ -20,7 +20,7 @@
             #This is used for different test suite dependent packages storage
             gs-packagepath: '/{suite}'
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             gs-packagepath: '/{stream}/{suite}'

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index b4910cf..8800a15 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -10,10 +10,12 @@
         stream: master
         branch: '{stream}'
         gs-pathname: ''
-#    colorado: &colorado
-#        stream: colorado
-#        branch: 'stable/{stream}'
-#        gs-pathname: '/{stream}'
+        disabled: false
+    danube: &danube
+        stream: danube
+        branch: 'stable/{stream}'
+        gs-pathname: '/{stream}'
+        disabled: true
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
@@ -28,14 +30,14 @@
             slave-label: compass-virtual
             os-version: 'xenial'
             <<: *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'
+            <<: *danube
+        - virtual:
+            slave-label: compass-virtual
+            os-version: 'trusty'
+            <<: *danube
 #--------------------------------
 #        master
 #--------------------------------
@@ -80,6 +82,8 @@
 - job-template:
     name: 'compass-{scenario}-{pod}-daily-{stream}'
 
+    disabled: '{obj:disabled}'
+
     concurrent: true
 
     properties:
@@ -309,35 +313,35 @@
         - timed: ''
 
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-baremetal-colorado-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-baremetal-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-baremetal-colorado-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-baremetal-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-baremetal-colorado-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-baremetal-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-baremetal-colorado-trigger'
+    name: 'compass-os-onos-nofeature-ha-baremetal-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-baremetal-colorado-trigger'
+    name: 'compass-os-ocl-nofeature-ha-baremetal-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-sfc-ha-baremetal-colorado-trigger'
+    name: 'compass-os-onos-sfc-ha-baremetal-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-moon-ha-baremetal-colorado-trigger'
+    name: 'compass-os-odl_l2-moon-ha-baremetal-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-kvm-ha-baremetal-colorado-trigger'
+    name: 'compass-os-nosdn-kvm-ha-baremetal-danube-trigger'
     triggers:
         - timed: ''
 
@@ -375,34 +379,34 @@
         - timed: ''
 
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-virtual-colorado-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-virtual-danube-trigger'
     triggers:
         - timed: '0 21 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-virtual-colorado-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-virtual-danube-trigger'
     triggers:
         - timed: '0 20 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-virtual-colorado-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-virtual-danube-trigger'
     triggers:
         - timed: '0 19 * * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-virtual-colorado-trigger'
+    name: 'compass-os-onos-nofeature-ha-virtual-danube-trigger'
     triggers:
         - timed: '0 18 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-virtual-colorado-trigger'
+    name: 'compass-os-ocl-nofeature-ha-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-sfc-ha-virtual-colorado-trigger'
+    name: 'compass-os-onos-sfc-ha-virtual-danube-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-moon-ha-virtual-colorado-trigger'
+    name: 'compass-os-odl_l2-moon-ha-virtual-danube-trigger'
     triggers:
         - timed: '0 14 * * *'
 - trigger:
-    name: 'compass-os-nosdn-kvm-ha-virtual-colorado-trigger'
+    name: 'compass-os-nosdn-kvm-ha-virtual-danube-trigger'
     triggers:
         - timed: ''

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 6cf35d6..6b40803 100644 (file)
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -12,9 +12,11 @@
         - master:
             branch: '{stream}'
             gs-pathname: ''
-        - colorado:
+            disabled: false
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
+            disabled: true
 
     jobs:
         - 'compass-build-iso-{stream}'
@@ -26,6 +28,8 @@
 - job-template:
     name: 'compass-build-iso-{stream}'
 
+    disabled: '{obj:disabled}'
+
     concurrent: true
 
     properties:
@@ -65,6 +69,8 @@
 
     description: "build ppa(using docker) in huawei lab"
 
+    disabled: '{obj:disabled}'
+
     node: huawei-build
 
     concurrent: true

diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 2277e92..c1179d7 100644 (file)
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -12,10 +12,10 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
     distro:
         - 'xenial':

diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml
index f997880..fccd53e 100644 (file)
--- a/jjb/conductor/conductor.yml
+++ b/jjb/conductor/conductor.yml
@@ -15,7 +15,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false

diff --git a/jjb/copper/copper.yml b/jjb/copper/copper.yml
index 9c736db..24f65a3 100644 (file)
--- a/jjb/copper/copper.yml
+++ b/jjb/copper/copper.yml
@@ -15,7 +15,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 79dee84..72d88c8 100644 (file)
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -9,7 +9,7 @@
             gs-pathname: ''
             docker-tag: 'master'
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             docker-tag: 'stable'

diff --git a/jjb/domino/domino.yml b/jjb/domino/domino.yml
index b653300..532fce6 100644 (file)
--- a/jjb/domino/domino.yml
+++ b/jjb/domino/domino.yml
@@ -11,7 +11,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false

diff --git a/jjb/dpacc/dpacc.yml b/jjb/dpacc/dpacc.yml
index 3eb581e..27e6635 100644 (file)
--- a/jjb/dpacc/dpacc.yml
+++ b/jjb/dpacc/dpacc.yml
@@ -15,7 +15,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index f8fdeb8..4920bff 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -14,8 +14,8 @@
         branch: '{stream}'
         gs-pathname: ''
         docker-tag: 'latest'
-    colorado: &colorado
-        stream: colorado
+    danube: &danube
+        stream: danube
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
         docker-tag: 'stable'
@@ -40,11 +40,11 @@
         - baremetal:
             slave-label: fuel-baremetal
             installer: fuel
-            <<: *colorado
+            <<: *danube
         - virtual:
             slave-label: fuel-virtual
             installer: fuel
-            <<: *colorado
+            <<: *danube
 # joid CI PODs
         - baremetal:
             slave-label: joid-baremetal
@@ -57,11 +57,11 @@
         - baremetal:
             slave-label: joid-baremetal
             installer: joid
-            <<: *colorado
+            <<: *danube
         - virtual:
             slave-label: joid-virtual
             installer: joid
-            <<: *colorado
+            <<: *danube
 # compass CI PODs
         - baremetal:
             slave-label: compass-baremetal
@@ -74,11 +74,11 @@
         - baremetal:
             slave-label: compass-baremetal
             installer: compass
-            <<: *colorado
+            <<: *danube
         - virtual:
             slave-label: compass-virtual
             installer: compass
-            <<: *colorado
+            <<: *danube
 # apex CI PODs
         - apex-verify-master:
             slave-label: '{pod}'
@@ -88,14 +88,14 @@
             slave-label: '{pod}'
             installer: apex
             <<: *master
-        - apex-verify-colorado:
-            slave-label: '{pod}'
-            installer: apex
-            <<: *colorado
-        - apex-daily-colorado:
-            slave-label: '{pod}'
-            installer: apex
-            <<: *colorado
+#        - apex-verify-danube:
+#            slave-label: '{pod}'
+#            installer: apex
+#            <<: *danube
+#        - apex-daily-danube:
+#            slave-label: '{pod}'
+#            installer: apex
+#            <<: *danube
 # armband CI PODs
         - armband-baremetal:
             slave-label: armband-baremetal
@@ -108,11 +108,11 @@
         - armband-baremetal:
             slave-label: armband-baremetal
             installer: fuel
-            <<: *colorado
+            <<: *danube
         - armband-virtual:
             slave-label: armband-virtual
             installer: fuel
-            <<: *colorado
+            <<: *danube
 # netvirt 3rd party ci
         - virtual:
             slave-label: odl-netvirt-virtual
@@ -156,7 +156,7 @@
         - zte-pod1:
             slave-label: '{pod}'
             installer: fuel
-            <<: *colorado
+            <<: *danube
         - zte-pod2:
             slave-label: '{pod}'
             installer: fuel
@@ -168,15 +168,15 @@
         - zte-pod3:
             slave-label: '{pod}'
             installer: fuel
-            <<: *colorado
+            <<: *danube
         - arm-pod2:
             slave-label: '{pod}'
             installer: fuel
-            <<: *colorado
+            <<: *danube
         - arm-pod3:
             slave-label: '{pod}'
             installer: fuel
-            <<: *colorado
+            <<: *danube
 # PODs for verify jobs triggered by each patch upload
         - ool-virtual1:
             slave-label: '{pod}'

diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml
index 11bc364..6a0768c 100644 (file)
--- a/jjb/functest/functest-project-jobs.yml
+++ b/jjb/functest/functest-project-jobs.yml
@@ -15,10 +15,10 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
 - job-template:
     name: 'functest-verify-{stream}'

diff --git a/jjb/ipv6/ipv6.yml b/jjb/ipv6/ipv6.yml
index db662ae..da54c52 100644 (file)
--- a/jjb/ipv6/ipv6.yml
+++ b/jjb/ipv6/ipv6.yml
@@ -15,7 +15,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false

diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index 20429f1..91fcc88 100644 (file)
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -17,10 +17,10 @@
         branch: '{stream}'
         disabled: false
         gs-pathname: ''
-    colorado: &colorado
-        stream: colorado
+    danube: &danube
+        stream: danube
         branch: 'stable/{stream}'
-        disabled: false
+        disabled: true
         gs-pathname: '/{stream}'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
@@ -36,10 +36,10 @@
             <<: *master
         - baremetal:
             slave-label: joid-baremetal
-            <<: *colorado
+            <<: *danube
         - virtual:
             slave-label: joid-virtual
-            <<: *colorado
+            <<: *danube
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
@@ -226,17 +226,17 @@
     name: 'joid-os-nosdn-nofeature-ha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
-# os-nosdn-nofeature-ha trigger - branch: colorado
+# os-nosdn-nofeature-ha trigger - branch: danube
 - trigger:
-    name: 'joid-os-nosdn-nofeature-ha-baremetal-colorado-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-baremetal-danube-trigger'
     triggers:
         - timed: '0 2 * * *'
 - trigger:
-    name: 'joid-os-nosdn-nofeature-ha-virtual-colorado-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-nofeature-ha-orange-pod1-colorado-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-orange-pod1-danube-trigger'
     triggers:
         - timed: ''
 # os-odl_l2-nofeature-ha trigger - branch: master
@@ -252,17 +252,17 @@
     name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
-# os-odl_l2-nofeature-ha trigger - branch: colorado
+# os-odl_l2-nofeature-ha trigger - branch: danube
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-baremetal-colorado-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-baremetal-danube-trigger'
     triggers:
         - timed: '0 7 * * *'
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-virtual-colorado-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-colorado-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-danube-trigger'
     triggers:
         - timed: ''
 # os-onos-nofeature-ha trigger - branch: master
@@ -278,17 +278,17 @@
     name: 'joid-os-onos-nofeature-ha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
-# os-onos-nofeature-ha trigger - branch: colorado
+# os-onos-nofeature-ha trigger - branch: danube
 - trigger:
-    name: 'joid-os-onos-nofeature-ha-baremetal-colorado-trigger'
+    name: 'joid-os-onos-nofeature-ha-baremetal-danube-trigger'
     triggers:
         - timed: '0 12 * * *'
 - trigger:
-    name: 'joid-os-onos-nofeature-ha-virtual-colorado-trigger'
+    name: 'joid-os-onos-nofeature-ha-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-onos-nofeature-ha-orange-pod1-colorado-trigger'
+    name: 'joid-os-onos-nofeature-ha-orange-pod1-danube-trigger'
     triggers:
         - timed: ''
 # os-onos-sfc-ha trigger - branch: master
@@ -304,17 +304,17 @@
     name: 'joid-os-onos-sfc-ha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
-# os-onos-sfc-ha trigger - branch: colorado
+# os-onos-sfc-ha trigger - branch: danube
 - trigger:
-    name: 'joid-os-onos-sfc-ha-baremetal-colorado-trigger'
+    name: 'joid-os-onos-sfc-ha-baremetal-danube-trigger'
     triggers:
         - timed: '0 17 * * *'
 - trigger:
-    name: 'joid-os-onos-sfc-ha-virtual-colorado-trigger'
+    name: 'joid-os-onos-sfc-ha-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-onos-sfc-ha-orange-pod1-colorado-trigger'
+    name: 'joid-os-onos-sfc-ha-orange-pod1-danube-trigger'
     triggers:
         - timed: ''
 # os-nosdn-lxd-noha trigger - branch: master
@@ -330,17 +330,17 @@
     name: 'joid-os-nosdn-lxd-noha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
-# os-nosdn-lxd-noha trigger - branch: colorado
+# os-nosdn-lxd-noha trigger - branch: danube
 - trigger:
-    name: 'joid-os-nosdn-lxd-noha-baremetal-colorado-trigger'
+    name: 'joid-os-nosdn-lxd-noha-baremetal-danube-trigger'
     triggers:
         - timed: '0 22 * * *'
 - trigger:
-    name: 'joid-os-nosdn-lxd-noha-virtual-colorado-trigger'
+    name: 'joid-os-nosdn-lxd-noha-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-lxd-noha-orange-pod1-colorado-trigger'
+    name: 'joid-os-nosdn-lxd-noha-orange-pod1-danube-trigger'
     triggers:
         - timed: ''
 # os-nosdn-lxd-ha trigger - branch: master
@@ -356,17 +356,17 @@
     name: 'joid-os-nosdn-lxd-ha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
-# os-nosdn-lxd-ha trigger - branch: colorado
+# os-nosdn-lxd-ha trigger - branch: danube
 - trigger:
-    name: 'joid-os-nosdn-lxd-ha-baremetal-colorado-trigger'
+    name: 'joid-os-nosdn-lxd-ha-baremetal-danube-trigger'
     triggers:
         - timed: '0 10 * * *'
 - trigger:
-    name: 'joid-os-nosdn-lxd-ha-virtual-colorado-trigger'
+    name: 'joid-os-nosdn-lxd-ha-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-lxd-ha-orange-pod1-colorado-trigger'
+    name: 'joid-os-nosdn-lxd-ha-orange-pod1-danube-trigger'
     triggers:
         - timed: ''
 # os-nosdn-nofeature-noha trigger - branch: master
@@ -382,16 +382,16 @@
     name: 'joid-os-nosdn-nofeature-noha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
-# os-nosdn-nofeature-noha trigger - branch: colorado
+# os-nosdn-nofeature-noha trigger - branch: danube
 - trigger:
-    name: 'joid-os-nosdn-nofeature-noha-baremetal-colorado-trigger'
+    name: 'joid-os-nosdn-nofeature-noha-baremetal-danube-trigger'
     triggers:
         - timed: '0 4 * * *'
 - trigger:
-    name: 'joid-os-nosdn-nofeature-noha-virtual-colorado-trigger'
+    name: 'joid-os-nosdn-nofeature-noha-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-nofeature-noha-orange-pod1-colorado-trigger'
+    name: 'joid-os-nosdn-nofeature-noha-orange-pod1-danube-trigger'
     triggers:
         - timed: ''

diff --git a/jjb/joid/joid-verify-jobs.yml b/jjb/joid/joid-verify-jobs.yml
index 516e822..6e821a5 100644 (file)
--- a/jjb/joid/joid-verify-jobs.yml
+++ b/jjb/joid/joid-verify-jobs.yml
@@ -12,7 +12,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false
@@ -54,7 +54,7 @@
             use-build-blocker: true
             blocking-jobs:
                 - 'joid-verify-master'
-                - 'joid-verify-colorado'
+                - 'joid-verify-danube'
             block-level: 'NODE'
 
     scm:

diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index 8ab821c..60f8de8 100644 (file)
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -8,7 +8,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false

diff --git a/jjb/multisite/multisite.yml b/jjb/multisite/multisite.yml
index cfe9b2d..6b64069 100644 (file)
--- a/jjb/multisite/multisite.yml
+++ b/jjb/multisite/multisite.yml
@@ -18,7 +18,7 @@
             gs-pathname: ''
             disabled: false
             timed: '@midnight'
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false

diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index 71d6a41..b820ecb 100644 (file)
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -14,7 +14,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false

diff --git a/jjb/onosfw/onosfw.yml b/jjb/onosfw/onosfw.yml
index 07bcdc5..d3a8454 100644 (file)
--- a/jjb/onosfw/onosfw.yml
+++ b/jjb/onosfw/onosfw.yml
@@ -13,10 +13,10 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: false
+            disabled: true
 
     project: 'onosfw'
 

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index d8cfabc..0d4c461 100644 (file)
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -17,10 +17,10 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: false
+            disabled: true
 
 ########################
 # job templates

diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index a5b8fd8..9b2adf3 100644 (file)
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -13,10 +13,10 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: false
+            disabled: true
 
 - job-template:
     name: 'ovsnfv-verify-{stream}'

diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml
index 50c7d25..de5587e 100644 (file)
--- a/jjb/parser/parser.yml
+++ b/jjb/parser/parser.yml
@@ -15,7 +15,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false

diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml
index 1a605d3..dbf1b92 100644 (file)
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -15,7 +15,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false

diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml
index c0066bf..fba5741 100644 (file)
--- a/jjb/prediction/prediction.yml
+++ b/jjb/prediction/prediction.yml
@@ -15,7 +15,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false

diff --git a/jjb/promise/promise.yml b/jjb/promise/promise.yml
index 38e1814..a0af6f4 100644 (file)
--- a/jjb/promise/promise.yml
+++ b/jjb/promise/promise.yml
@@ -15,7 +15,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index be04b15..02dfb75 100644 (file)
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -10,10 +10,10 @@
         stream: master
         branch: '{stream}'
         disabled: false
-    colorado: &colorado
-        stream: colorado
+    danube: &danube
+        stream: danube
         branch: 'stable/{stream}'
-        disabled: false
+        disabled: true
 
     project:
         # projects with jobs for master
@@ -33,13 +33,13 @@
             <<: *master
         # projects with jobs for stable
         - 'bottlenecks':
-            <<: *colorado
+            <<: *danube
         - 'functest':
-            <<: *colorado
+            <<: *danube
         - 'storperf':
-            <<: *colorado
+            <<: *danube
         - 'yardstick':
-            <<: *colorado
+            <<: *danube
 
     jobs:
         - '{project}-docker-build-push-{stream}'

diff --git a/jjb/releng/opnfv-docs.yml b/jjb/releng/opnfv-docs.yml
index cd70a80..f6092ee 100644 (file)
--- a/jjb/releng/opnfv-docs.yml
+++ b/jjb/releng/opnfv-docs.yml
@@ -17,11 +17,11 @@
             doc-version: ''
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             doc-version: '3.0'
             gs-pathname: '/{stream}/{doc-version}'
-            disabled: false
+            disabled: true
 
 ########################
 # job templates

diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml
index a96fce6..590790f 100644 (file)
--- a/jjb/releng/opnfv-lint.yml
+++ b/jjb/releng/opnfv-lint.yml
@@ -16,7 +16,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false

diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index 1a2eb5e..95d464c 100644 (file)
--- a/jjb/storperf/storperf.yml
+++ b/jjb/storperf/storperf.yml
@@ -13,10 +13,10 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: false
+            disabled: true
 
 - job-template:
     name: 'storperf-verify-{stream}'

diff --git a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
index 54e8338..c129f49 100644 (file)
--- a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
+++ b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
@@ -11,7 +11,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false

diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index fe8ea53..4cfe5d9 100644 (file)
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -15,10 +15,10 @@
             gs-pathname: ''
             disabled: false
             slave-label: 'opnfv-build-ubuntu'
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: false
+            disabled: true
             slave-label: 'intel-pod3'
 
 - job-template:

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 1ad5417..ed2dcca 100644 (file)
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -14,8 +14,8 @@
         branch: '{stream}'
         gs-pathname: ''
         docker-tag: 'latest'
-    colorado: &colorado
-        stream: colorado
+    danube: &danube
+        stream: danube
         branch: 'stable/{stream}'
         gs-pathname: '{stream}'
         docker-tag: 'stable'
@@ -43,12 +43,12 @@
             slave-label: fuel-baremetal
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
         - virtual:
             slave-label: fuel-virtual
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
 # armband CI PODs
         - armband-baremetal:
             slave-label: armband-baremetal
@@ -64,12 +64,12 @@
             slave-label: armband-baremetal
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
         - armband-virtual:
             slave-label: armband-virtual
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
 # joid CI PODs
         - baremetal:
             slave-label: joid-baremetal
@@ -85,12 +85,12 @@
             slave-label: joid-baremetal
             installer: joid
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
         - virtual:
             slave-label: joid-virtual
             installer: joid
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
 
 # compass CI PODs
         - baremetal:
@@ -107,12 +107,12 @@
             slave-label: compass-baremetal
             installer: compass
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
         - virtual:
             slave-label: compass-virtual
             installer: compass
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
 #--------------------------------
 #    Installers not using labels
 #            CI PODs
@@ -128,7 +128,7 @@
             slave-label: '{pod}'
             installer: apex
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
@@ -146,7 +146,7 @@
             slave-label: '{pod}'
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
         - zte-pod2:
             slave-label: '{pod}'
             installer: fuel
@@ -161,7 +161,7 @@
             slave-label: '{pod}'
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
         - arm-pod2:
             slave-label: '{pod}'
             installer: fuel
@@ -171,7 +171,7 @@
             slave-label: '{pod}'
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
         - arm-pod3:
             slave-label: '{pod}'
             installer: fuel
@@ -181,7 +181,7 @@
             slave-label: '{pod}'
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
         - orange-pod2:
             slave-label: '{pod}'
             installer: joid

diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index 48c9d9d..a54750e 100644 (file)
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -16,7 +16,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false