bottlenecks project branch to colorado

switch to colorado job, annotate offline pods.

Change-Id: I905a67e2085d38719d42875a298d9c28c7a7556a
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>

diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index 686b7d4..4bc56ab 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'
         gs-packagepath: '/{suite}'
         #docker tag used for version control
         docker-tag: 'latest'

-    brahmaputra: &brahmaputra
-        stream: brahmaputra
+    colorado: &colorado
+        stream: colorado

         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
         gs-packagepath: '/{stream}/{suite}'
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
         gs-packagepath: '/{stream}/{suite}'


@@ -48,26 +48,26 @@
             slave-label: compass-baremetal
             installer: compass
             auto-trigger-name: 'daily-trigger-disabled'
             slave-label: compass-baremetal
             installer: compass
             auto-trigger-name: 'daily-trigger-disabled'

-            <<: *brahmaputra
+            <<: *colorado

         - virtual:
             slave-label: compass-virtual
             installer: compass
             auto-trigger-name: 'daily-trigger-disabled'
         - virtual:
             slave-label: compass-virtual
             installer: compass
             auto-trigger-name: 'daily-trigger-disabled'

-            <<: *brahmaputra
+            <<: *colorado

 
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
 
 #--------------------------------
 #        None-CI PODs
 #--------------------------------

-        - orange-pod2:
-            slave-label: '{pod}'
-            installer: joid
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *brahmaputra
-        - orange-pod2:
-            slave-label: '{pod}'
-            installer: joid
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
+       # - orange-pod2:
+       #     slave-label: '{pod}'
+       #     installer: joid
+       #     auto-trigger-name: 'daily-trigger-disabled'
+       #     <<: *colorado
+       # - orange-pod2:
+       #     slave-label: '{pod}'
+       #     installer: joid
+       #     auto-trigger-name: 'daily-trigger-disabled'
+       #     <<: *master

         - huawei-pod2:
             slave-label: '{pod}'
             installer: compass
         - huawei-pod2:
             slave-label: '{pod}'
             installer: compass