diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 33 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 19 |
2 files changed, 47 insertions, 5 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index b3438d799..dd046c1c7 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -23,15 +23,22 @@ # brahmaputra #-------------------------------- - huawei-us-deploy-bare-1: + os-version: 'trusty' <<: *brahmaputra - huawei-virtual: + os-version: 'trusty' <<: *brahmaputra #-------------------------------- # master #-------------------------------- + - huawei-us-deploy-bare-2: + os-version: 'centos7' + <<: *master - intel-pod8: + os-version: 'trusty' <<: *master - huawei-virtual: + os-version: 'trusty' <<: *master scenario: @@ -99,6 +106,7 @@ current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} + COMPASS_OS_VERSION={os-version} same-node: true block: true - trigger-builds: @@ -200,16 +208,31 @@ choices: - 'liberty' - 'juno' - - choice: - name: COMPASS_OS_VERSION - choices: - - 'trusty' - - 'centos7' ######################## # trigger macros ######################## - trigger: + name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-2-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l2-nofeature-ha-huawei-us-deploy-bare-2-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l3-nofeature-ha-huawei-us-deploy-bare-2-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-onos-nofeature-ha-huawei-us-deploy-bare-2-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-ocl-nofeature-ha-huawei-us-deploy-bare-2-trigger' + triggers: + - timed: '' +- trigger: name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-1-trigger' triggers: - timed: '0 3 * * * ' diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 475cc2c6c..0090f13b0 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -232,6 +232,25 @@ description: 'Git URL to use on this Jenkins Slave' - parameter: + name: 'huawei-us-deploy-bare-2-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - huawei-us-deploy-bare-2 + default-slaves: + - huawei-us-deploy-bare-2 + - string: + name: INSTALLER_VERSION + default: stable + description: 'Version of the installer to deploy' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + +- parameter: name: 'huawei-virtual-defaults' parameters: - label: |