diff options
| -rw-r--r-- | jjb/fuel/fuel-project-jobs.yml | 17 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 11 |
2 files changed, 15 insertions, 13 deletions
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index 2e30fb1e6..10d49796c 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -40,7 +40,7 @@ parameters: - project-parameter: project: '{project}' - - 'ericsson-ca-build-1-defaults' + - 'fuel-build-defaults' - '{installer}-defaults' - fuel-project-parameter: gs-pathname: '{gs-pathname}' @@ -77,17 +77,12 @@ concurrent: true - properties: - - throttle: - enabled: true - max-total: 3 - parameters: - project-parameter: project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'ericsson-ca-build-1-defaults' + - 'fuel-build-defaults' - '{installer}-defaults' - fuel-project-parameter: gs-pathname: '{gs-pathname}' @@ -146,20 +141,16 @@ concurrent: true - properties: - - throttle: - enabled: true - max-total: 2 - parameters: - project-parameter: project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'ericsson-ca-build-1-defaults' + - 'fuel-build-defaults' - '{installer}-defaults' - fuel-project-parameter: gs-pathname: '{gs-pathname}' + scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 5204f7926..414853784 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -430,6 +430,17 @@ description: 'Git URL to use on these Jenkins Slaves' - parameter: + name: 'fuel-build-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'fuel-build' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on these Jenkins Slaves' + +- parameter: name: 'intel-us-deploy-virtual-2-defaults' parameters: - node: |