diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/fuel/fuel-verify-jobs.yml | 19 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 15 |
2 files changed, 21 insertions, 13 deletions
diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml index 2662cb7c0..f4bdbdd45 100644 --- a/jjb/fuel/fuel-verify-jobs.yml +++ b/jjb/fuel/fuel-verify-jobs.yml @@ -21,13 +21,13 @@ ##################################### phase: - 'basic': - slave-label: 'opnfv-build-ubuntu' + slave-label: 'opnfv-build' - 'build': slave-label: 'opnfv-build-ubuntu' - 'deploy-virtual': - slave-label: 'fuel-virtual' + slave-label: 'opnfv-build' - 'smoke-test': - slave-label: 'fuel-virtual' + slave-label: 'opnfv-build' ##################################### # jobs ##################################### @@ -50,14 +50,7 @@ - throttle: enabled: true max-total: 4 - max-per-node: 1 option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'fuel-verify-master' - - 'fuel-verify-colorado' - block-level: 'NODE' scm: - gerrit-trigger-scm: @@ -108,7 +101,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'fuel-virtual-defaults' + - 'opnfv-build-defaults' - 'fuel-verify-defaults': gs-pathname: '{gs-pathname}' @@ -154,7 +147,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: true + node-parameters: false kill-phase-on: FAILURE abort-all-job: true - multijob: @@ -168,7 +161,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: true + node-parameters: false kill-phase-on: FAILURE abort-all-job: true diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 019148a96..562a9dae9 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -254,6 +254,21 @@ default: $WORKSPACE/build_output description: "Directory where the build artifact will be located upon the completion of the build." - parameter: + name: 'opnfv-build-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'opnfv-build' + description: 'Slave label on Jenkins' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." +- parameter: name: 'huawei-build-defaults' parameters: - node: |