fis bugs for bottlenecks project jjb

JIRA: BOTTLENECK-4

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

diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml
index f15aa8f..46fb12a 100644 (file)
--- a/jjb/bottlenecks/bottlenecks.yml
+++ b/jjb/bottlenecks/bottlenecks.yml
@@ -88,6 +88,7 @@
         - project-parameter:
             project: '{project}'
         - 'ericsson-ca-build-1-defaults'
+        - 'bottlenecks-parameter'
 
     scm:
         - git-scm:
@@ -134,10 +135,10 @@
 
     builders:
         - 'bottlenecks-fetch-os-creds'
-        - 'run-rubbos-env-preparation'
+        #- 'run-rubbos-env-preparation'
         - 'bottlenecks-instance-creation'
-        - 'run-rubbos-tools-installation'
-        - 'rubbos-exec'
+        #- 'run-rubbos-tools-installation'
+        #- 'rubbos-exec'
 
     publishers:
         - email:
@@ -149,15 +150,15 @@
 - parameter:
     name: bottlenecks-parameter
     parameters:
-        -string:
+        - string:
            name: CACHE_DIR
            default: $WORKSPACE/cache
            description: "the cache to store packages downloaded from public IP"
-        -string:
+        - string:
            name: RUBBOS_URL
            default: http://artifacts.opnfv.org/bottlenecks/rubbos
            description: "LF artifacts url for storage of bottlenecks packages"
-        -string:
+        - string:
            name: PACKAGE_URL
            default: http://205.177.226.235:9999/bottlenecks/rubbos/
            description: "the url where we store the packages used for bottlenecks rubbos"

diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index d28d529..a55c785 100644 (file)
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -165,7 +165,7 @@
 
     wrappers:
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users: '{ssh-credentials}'
 
     triggers:
         - gerrit: