diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 100 | ||||
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 8 | ||||
| -rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docs.yml | 2 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 33 | ||||
| -rw-r--r-- | jjb/ovsnfv/ovsnfv.yml | 6 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 16 |
7 files changed, 122 insertions, 45 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 6b69afe26..a7c7de07b 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -61,7 +61,7 @@ - 'os-nosdn-nofeature-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l2-bgpvpn-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-nosdn-kvm_ovs-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-vlan-ha': @@ -76,7 +76,7 @@ - 'os-nosdn-nofeature-noha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-kvm-noha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-nosdn-kvm_ovs-noha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-ovs-noha': @@ -135,7 +135,7 @@ same-node: true block: true - trigger-builds: - - project: 'functest-fuel-{pod}-daily-{stream}' + - project: 'yardstick-fuel-{pod}-daily-{stream}' current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} @@ -146,7 +146,7 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'yardstick-fuel-{pod}-daily-{stream}' + - project: 'functest-fuel-{pod}-daily-{stream}' current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} @@ -231,7 +231,7 @@ - trigger: name: 'fuel-os-nosdn-nofeature-ha-opnfv-jump-2-master-trigger' triggers: - - timed: '0 14 * * *' + - timed: '0 10 * * *' - trigger: name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod1-master-trigger' triggers: @@ -255,7 +255,7 @@ - trigger: name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-brahmaputra-trigger' triggers: - - timed: '0 14 * * *' + - timed: '0 10 * * *' - trigger: name: 'fuel-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger' triggers: @@ -265,7 +265,7 @@ - trigger: name: 'fuel-os-nosdn-kvm-ha-opnfv-jump-2-master-trigger' triggers: - - timed: '0 18 * * *' + - timed: '' - trigger: name: 'fuel-os-nosdn-kvm-ha-ericsson-pod1-master-trigger' triggers: @@ -289,7 +289,7 @@ - trigger: name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-brahmaputra-trigger' triggers: - - timed: '0 18 * * *' + - timed: '' - trigger: name: 'fuel-os-nosdn-kvm-ha-virtual-brahmaputra-trigger' triggers: @@ -299,7 +299,7 @@ - trigger: name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-master-trigger' triggers: - - timed: '0 2 * * *' + - timed: '0 1 * * */5' - trigger: name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-master-trigger' triggers: @@ -323,7 +323,7 @@ - trigger: name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-brahmaputra-trigger' triggers: - - timed: '0 2 * * *' + - timed: '0 1 * * */5' - trigger: name: 'fuel-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger' triggers: @@ -333,7 +333,7 @@ - trigger: name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-master-trigger' triggers: - - timed: '0 6 * * *' + - timed: '0 4 * * *' - trigger: name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-master-trigger' triggers: @@ -357,7 +357,7 @@ - trigger: name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-brahmaputra-trigger' triggers: - - timed: '0 6 * * *' + - timed: '0 4 * * *' - trigger: name: 'fuel-os-odl_l3-nofeature-ha-virtual-brahmaputra-trigger' triggers: @@ -367,7 +367,7 @@ - trigger: name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-master-trigger' triggers: - - timed: '0 10 * * *' + - timed: '0 13 * * */5' - trigger: name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-master-trigger' triggers: @@ -391,7 +391,7 @@ - trigger: name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-brahmaputra-trigger' triggers: - - timed: '0 10 * * *' + - timed: '0 13 * * */5' - trigger: name: 'fuel-os-onos-nofeature-ha-virtual-brahmaputra-trigger' triggers: @@ -402,7 +402,7 @@ - trigger: name: 'fuel-os-nosdn-ovs-ha-opnfv-jump-2-master-trigger' triggers: - - timed: '0 22 * * *' + - timed: '0 16 * * *' - trigger: name: 'fuel-os-nosdn-ovs-ha-ericsson-pod1-master-trigger' triggers: @@ -426,8 +426,76 @@ - trigger: name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-brahmaputra-trigger' triggers: - - timed: '0 22 * * *' + - timed: '0 16 * * *' - trigger: name: 'fuel-os-nosdn-ovs-ha-virtual-brahmaputra-trigger' triggers: - timed: '' + +# os-odl_l2-bgpvpn-ha trigger +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-master-trigger' + triggers: + - timed: '0 22 * * *' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 22 * * *' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-brahmaputra-trigger' + triggers: + - timed: '' + +# os-nosdn-kvm-ha trigger +- trigger: + name: 'fuel-os-nosdn-kvm-noha-opnfv-jump-2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-ericsson-pod1-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-ericsson-pod2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-virtual-master-trigger' + triggers: + - timed: '0 6,18 * * *' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-opnfv-jump-2-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-ericsson-pod1-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-virtual-brahmaputra-trigger' + triggers: + - timed: '0 0,12 * * *' diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 1165b2a2c..c14b4e05a 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -26,9 +26,6 @@ - opnfv-jump-1: installer: apex <<: *brahmaputra - - opnfv-jump-2: - installer: fuel - <<: *brahmaputra - intel-pod5: installer: joid <<: *brahmaputra @@ -68,9 +65,6 @@ - ericsson-pod1: installer: fuel <<: *master - - ericsson-pod2: - installer: fuel - <<: *master - orange-test1: installer: fuel <<: *master @@ -112,7 +106,7 @@ - build-name: name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO' - timeout: - timeout: 210 + timeout: 400 abort: true parameters: diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index 909a885ab..971addc89 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -213,7 +213,7 @@ - trigger: name: 'joid-os-onos-nofeature-ha-intel-pod5-trigger' triggers: - - timed: '0 14 * * *' + - timed: '' - trigger: name: 'joid-os-onos-nofeature-ha-intel-pod6-trigger' triggers: diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml index eb6e58b92..d7062226a 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' + 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' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 5e0274d84..5c1c58ff2 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -263,30 +263,45 @@ description: "Directory where the build artifact will be located upon the completion of the build." - parameter: - name: 'intel-us-build-1-defaults' + name: 'intel-build1-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - intel-us-build-1 + - intel-build1 default-slaves: - - intel-us-build-1 + - intel-build1 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - parameter: - name: 'intel-us-build-2-defaults' + name: 'intel-build2-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - intel-us-build-2 + - intel-build2 default-slaves: - - intel-us-build-2 + - intel-build2 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + +- parameter: + name: 'intel-build3-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-build3 + default-slaves: + - intel-build3 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -399,15 +414,15 @@ description: 'Git URL to use on these Jenkins Slaves' - parameter: - name: 'intel-us-deploy-virtual-2-defaults' + name: 'intel-virtual2-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - intel-us-deploy-virtual-2 + - intel-virtual2 default-slaves: - - intel-us-deploy-virtual-2 + - intel-virtual2 - string: name: INSTALLER_VERSION default: latest diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml index d0c180c5b..8a119d9fb 100644 --- a/jjb/ovsnfv/ovsnfv.yml +++ b/jjb/ovsnfv/ovsnfv.yml @@ -24,7 +24,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'intel-us-build-2-defaults' + - 'intel-build2-defaults' - string: name: GS_URL default: '$GS_BASE{gs-pathname}' @@ -73,7 +73,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'intel-us-build-2-defaults' + - 'intel-build2-defaults' - string: name: GS_URL default: '$GS_BASE{gs-pathname}' @@ -114,7 +114,7 @@ parameters: - project-parameter: project: '{project}' - - 'intel-us-build-2-defaults' + - 'intel-build2-defaults' - string: name: GS_URL default: '$GS_BASE{gs-pathname}' diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index e7221e70c..df51eb135 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -293,7 +293,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -301,7 +301,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -317,7 +317,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-i 10.118.36.90:8086' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -325,7 +325,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-i 10.118.36.90:8086' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -333,7 +333,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-i 10.118.36.90:8086' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -341,7 +341,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-i 10.118.36.90:8086' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -349,7 +349,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -365,7 +365,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: |