summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-02-02 09:44:26 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-02-02 09:44:26 +0100
commit23660b8efd3eb8451a2d76b037bb9ab46d48af18 (patch)
tree82dbdc48d9b951047fb1a687bc8b149b8e618bb8
parent915590bb6510ebc90656c8433faa75db0f485715 (diff)
fuel: Adjust build blockers and reconfigure generic-deploy job
Change-Id: I0a190b0e6a4469c356d7762cf4605c4a1ea5ea6a Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/fuel/fuel-ci-jobs.yml3
-rw-r--r--jjb/fuel/fuel-project-jobs.yml21
2 files changed, 20 insertions, 4 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index cf421356a..45065f872 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -102,6 +102,7 @@
use-build-blocker: true
blocking-jobs:
- 'fuel-os-.*?-{pod}-daily-{stream}'
+ block-level: 'NODE'
wrappers:
- build-name:
@@ -167,6 +168,8 @@
use-build-blocker: true
blocking-jobs:
- 'fuel-deploy-{pod}-daily-{stream}'
+ - 'fuel-deploy-generic-daily-.*'
+ block-level: 'NODE'
parameters:
- project-parameter:
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 0ba8e3ff1..e42aa9012 100644
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -279,28 +279,41 @@
- job-template:
name: 'fuel-deploy-generic-daily-{stream}'
- concurrent: false
+ concurrent: true
disabled: false
properties:
- throttle:
enabled: true
- max-total: 1
max-per-node: 1
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - 'fuel-os-.*?-ericsson-pod2-daily-{stream}'
+ - 'fuel-os-.*?-daily-.*'
+ - 'fuel-deploy-generic-daily-.*'
+ block-level: 'NODE'
parameters:
- project-parameter:
project: '{project}'
- - 'ericsson-pod2-defaults'
- '{installer}-defaults'
- string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+ - string:
name: DEPLOY_SCENARIO
default: 'os-odl_l2-nofeature-ha'
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - ericsson-pod2
+ - opnfv-jump-2
+ - ericsson-pod1
+ default-slaves:
+ - ericsson-pod2
- fuel-project-parameter:
gs-pathname: '{gs-pathname}'