X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbottlenecks%2Fbottlenecks-ci-jobs.yml;h=92ec2d8665c16bceff6a63805ba34abfa45def02;hb=76d12ac2d4bfd964f8a2851983aaa0098df380d8;hp=686b7d45c114d9caf7a1cb738a7999aff286cf74;hpb=a80964a8441ecdd19104a0d02adac553a82a5cd5;p=releng.git

diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index 686b7d45c..92ec2d866 100644
--- 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'
-    brahmaputra: &brahmaputra
-        stream: brahmaputra
+    danube: &danube
+        stream: danube
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
         gs-packagepath: '/{stream}/{suite}'
@@ -48,32 +48,26 @@
             slave-label: compass-baremetal
             installer: compass
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *brahmaputra
+            <<: *danube
         - virtual:
             slave-label: compass-virtual
             installer: compass
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *brahmaputra
+            <<: *danube
 
 #--------------------------------
 #        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
-        - huawei-pod2:
-            slave-label: '{pod}'
-            installer: compass
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-
+       # - orange-pod2:
+       #     slave-label: '{pod}'
+       #     installer: joid
+       #     auto-trigger-name: 'daily-trigger-disabled'
+       #     <<: *danube
+       # - orange-pod2:
+       #     slave-label: '{pod}'
+       #     installer: joid
+       #     auto-trigger-name: 'daily-trigger-disabled'
+       #     <<: *master
 #--------------------------------------------
     suite:
         - 'rubbos'
@@ -101,6 +95,8 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
         - '{slave-label}-defaults'
         - '{installer}-defaults'
         - 'bottlenecks-params-{slave-label}'
@@ -125,10 +121,7 @@
             description: "docker image tag used for version control"
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     builders:
         - 'bottlenecks-env-cleanup'
@@ -224,14 +217,6 @@
             default: ''
             description: 'Arguments to use in order to choose the backend DB'
 
-- parameter:
-    name: 'bottlenecks-params-huawei-pod2'
-    parameters:
-        - string:
-            name: BOTTLENECKS_DB_TARGET
-            default: '104.197.68.199:8086'
-            description: 'Arguments to use in order to choose the backend DB'
-
 - parameter:
     name: 'bottlenecks-params-orange-pod2'
     parameters: