summaryrefslogtreecommitdiffstats
path: root/jjb/compass4nfv/compass-project-jobs.yml
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/compass4nfv/compass-project-jobs.yml')
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml18
1 files changed, 12 insertions, 6 deletions
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 3a10cbd75..b3d9f9e43 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -8,9 +8,11 @@
stream:
- master:
+ slave_name: 'huawei-us-deploy-vm-1'
branch: '{stream}'
gs-pathname: ''
- brahmaputra:
+ slave_name: 'huawei-us-deploy-vm-2'
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
@@ -30,9 +32,9 @@
disabled: false
- node: 'huawei-virtual'
+ node: '{slave_name}'
- concurrent: true
+ concurrent: false
wrappers:
- timeout:
@@ -42,7 +44,7 @@
properties:
- throttle:
enabled: true
- max-total: 0
+ max-total: 4
max-per-node: 1
parameters:
@@ -53,11 +55,15 @@
- compass-project-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
- - '{node}-defaults'
+ #- '{node}-defaults'
- '{installer}-defaults'
- string:
name: DEPLOY_SCENARIO
default: 'os-nosdn-nofeature-ha'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
triggers:
- gerrit:
@@ -100,10 +106,10 @@
max-per-node: 1
scm:
- - git-scm:
+ - gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
refspec: '$GERRIT_REFSPEC'
- branch: '{branch}'
+ choosing-strategy: 'gerrit'
builders:
- shell: