diff options
Diffstat (limited to 'jjb/opnfv')
| -rw-r--r-- | jjb/opnfv/installer-params.yml | 4 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docs.yml | 46 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 50 |
3 files changed, 74 insertions, 26 deletions
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index 60fee9263..833a1d449 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -49,6 +49,10 @@ name: EXTERNAL_NETWORK default: 'admin_floating_net' description: 'external network for test' + - string: + name: BRIDGE + default: 'pxebr' + description: 'pxe bridge for booting of Fuel master' - parameter: name: 'joid-defaults' diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml index 0c11757ec..2b80b84f0 100644 --- a/jjb/opnfv/opnfv-docs.yml +++ b/jjb/opnfv/opnfv-docs.yml @@ -51,19 +51,16 @@ - comment-added-contains-event: comment-contains-value: 'reverify' projects: - - project-compare-type: 'ANT' - project-pattern: '(?!yardstick)' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: 'docs/**' - - project-compare-type: 'ANT' - project-pattern: 'yardstick' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' + - project-compare-type: 'ANT' + project-pattern: '*' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: docs/** + - compare-type: ANT + pattern: yardstick/** builders: - upload-review-docs @@ -94,19 +91,16 @@ - comment-added-contains-event: comment-contains-value: 'remerge' projects: - - project-compare-type: 'ANT' - project-pattern: '(?!yardstick)' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: 'docs/**' - - project-compare-type: 'ANT' - project-pattern: 'yardstick' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' + - project-compare-type: 'ANT' + project-pattern: '*' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: docs/** + - compare-type: ANT + pattern: yardstick/** builders: - upload-merged-docs diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 7b9983060..4d73ad807 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -229,6 +229,20 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - parameter: + name: 'intel-pod1-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-pod1 + default-slaves: + - intel-pod1 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' +- parameter: name: 'intel-pod2-defaults' parameters: - node: @@ -323,6 +337,42 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - parameter: + name: 'zte-pod2-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - zte-pod2 + default-slaves: + - zte-pod2 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: INSTALLER_IP + default: '10.20.1.2' + description: 'IP of the installer' +- parameter: + name: 'zte-pod3-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - zte-pod3 + default-slaves: + - zte-pod3 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: BRIDGE + default: 'br0' + description: 'pxe bridge for booting of Fuel master' +- parameter: name: 'juniper-pod1-defaults' parameters: - node: |