summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthewLi <matthew.lijun@huawei.com>2016-01-03 21:14:45 -0500
committerMatthewLi <matthew.lijun@huawei.com>2016-01-03 22:31:44 -0500
commit0abd314341bd5c1fa7fbcbaaaa5afd61b51012dd (patch)
tree2c8a8074feba2cacf00adbb51a4c9a387db99257
parentbb7d4a0e02785c5663695a3424d2ff4dd258da82 (diff)
fis bugs for bottlenecks project jjb
JIRA: BOTTLENECK-4 Change-Id: I3cdb4f15c910e8b32a6531355fca91c7ed04445a Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
-rw-r--r--jjb/bottlenecks/bottlenecks.yml13
-rw-r--r--jjb/fuel/fuel-project-jobs.yml2
2 files changed, 8 insertions, 7 deletions
diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml
index f15aa8f7c..46fb12aa3 100644
--- 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 d28d52973..a55c785c4 100644
--- 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: