diff options
| -rw-r--r-- | jjb/opnfv/opnfv-docs.yml | 4 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 26 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 18 |
3 files changed, 44 insertions, 4 deletions
diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml index f9d6a89bc..e5c87a64d 100644 --- a/jjb/opnfv/opnfv-docs.yml +++ b/jjb/opnfv/opnfv-docs.yml @@ -53,7 +53,7 @@ projects: - project-compare-type: 'REG_EXP' #Left out arno projects oscar|octopus|functest|genesis - project-pattern: 'vswitchperf|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|octopus|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest|genesisreq|models' + project-pattern: 'vswitchperf|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|octopus|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest|genesisreq|models|domino|netready' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' @@ -91,7 +91,7 @@ comment-contains-value: 'remerge' projects: - project-compare-type: 'REG_EXP' - project-pattern: 'vswitchperf|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|octopus|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest|genesisreq|models' + project-pattern: 'vswitchperf|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|octopus|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest|genesisreq|models|domino|netready' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index cc196737b..fb9d66450 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -144,7 +144,7 @@ description: "Disks to use by ceph (comma separated list)" - string: name: EXTERNAL_NETWORK - default: ext-net;flat;10.2.65.5;10.2.65.250;10.2.65.1;10.2.65.0/24 + default: ext-net;flat;10.5.15.5;10.5.15.250;10.5.15.254;10.5.15.0/24 description: "External network to create for pod5 (name;type;first ip;last ip; gateway;network)" - parameter: @@ -171,7 +171,7 @@ description: "Disks to use by ceph (comma separated list)" - string: name: EXTERNAL_NETWORK - default: ext-net;flat;10.2.66.5;10.2.66.250;10.2.66.1;10.2.66.0/24 + default: ext-net;flat;10.6.15.5;10.6.15.250;10.6.15.254;10.6.15.0/24 description: "External network to create for pod6 (name;type;first ip;last ip; gateway;network)" - parameter: @@ -288,6 +288,28 @@ description: 'Git URL to use on this Jenkins Slave' - parameter: + name: 'huawei-sh-pod6-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - huawei-sh-pod6 + default-slaves: + - huawei-sh-pod6 + - label: + name: SLAVE_LABEL + default: 'huawei-test' + - 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: 'opnfv-build-defaults' parameters: - label: diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index f3c0ad4b1..57aa29c54 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -143,6 +143,11 @@ suite: daily auto-trigger-name: 'yardstick-daily-huawei-sh-test-2-trigger' <<: *master + - huawei-sh-pod6: + installer: compass + suite: daily + auto-trigger-name: 'yardstick-daily-huawei-sh-pod6-trigger' + <<: *master - virtual: installer: joid suite: daily @@ -421,6 +426,14 @@ default: '' description: 'Arguments to use in order to choose the backend DB' +- parameter: + name: 'yardstick-params-huawei-sh-pod6' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '' + description: 'Arguments to use in order to choose the backend DB' + ####################### ## trigger macros ####################### @@ -439,3 +452,8 @@ name: 'yardstick-daily-huawei-sh-test-2-trigger' triggers: - timed: '0 1 * * *' + +- trigger: + name: 'yardstick-daily-huawei-sh-pod6-trigger' + triggers: + - timed: '0 1 * * *'
\ No newline at end of file |