diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 8 | ||||
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 162 | ||||
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 3 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 13 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-project-jobs.yml | 2 |
5 files changed, 107 insertions, 81 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 40f17b889..c9560a572 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -215,11 +215,11 @@ - trigger: name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-2-trigger' triggers: - - timed: '' + - timed: '0 3 * * *' - trigger: name: 'compass-os-odl_l2-nofeature-ha-huawei-us-deploy-bare-2-trigger' triggers: - - timed: '' + - timed: '0 21 * * *' - trigger: name: 'compass-os-odl_l3-nofeature-ha-huawei-us-deploy-bare-2-trigger' triggers: @@ -227,11 +227,11 @@ - trigger: name: 'compass-os-onos-nofeature-ha-huawei-us-deploy-bare-2-trigger' triggers: - - timed: '' + - timed: '0 15 * * *' - trigger: name: 'compass-os-ocl-nofeature-ha-huawei-us-deploy-bare-2-trigger' triggers: - - timed: '' + - timed: '0 9 * * *' - trigger: name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-1-trigger' triggers: diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 2c1a4ab54..e1816b528 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -48,22 +48,22 @@ #-------------------------------- scenario: # HA scenarios + - 'os-nosdn-nofeature-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l2-nofeature-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l3-nofeature-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-onos-nofeature-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' + - 'os-odl_l2-bgpvpn-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' + - 'os-odl_l2-sfc-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-nosdn-kvm-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-nosdn-ovs-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-nofeature-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - - 'os-odl_l2-bgpvpn-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - - 'os-odl_l2-sfc-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-kvm_ovs-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-vlan-ha': @@ -232,10 +232,88 @@ # trigger macros ######################## # os-nosdn-nofeature-ha trigger +# CI PODs +#----------------------------------------------- +# LF POD2 Triggers running against master branch +#----------------------------------------------- - trigger: name: 'fuel-os-nosdn-nofeature-ha-opnfv-jump-2-master-trigger' triggers: + - timed: '0 0 * * *' +- trigger: + name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-master-trigger' + triggers: + - timed: '0 3 * * *' +- trigger: + name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-master-trigger' + triggers: + - timed: '0 6 * * *' +- trigger: + name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-master-trigger' + triggers: + - timed: '0 9 * * *' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-master-trigger' + triggers: + - timed: '0 12 * * *' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-opnfv-jump-2-master-trigger' + triggers: + - timed: '0 15 * * *' +- trigger: + name: 'fuel-os-nosdn-kvm-ha-opnfv-jump-2-master-trigger' + triggers: + - timed: '0 18 * * *' +- trigger: + name: 'fuel-os-nosdn-ovs-ha-opnfv-jump-2-master-trigger' + triggers: + - timed: '0 21 * * *' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-opnfv-jump-2-master-trigger' + triggers: + - timed: '' +#----------------------------------------------- +# Ericsson POD2 Triggers running against brahmaputra branch +#----------------------------------------------- +- trigger: + name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 12 * * *' +- trigger: + name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 15 * * *' +- trigger: + name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 18 * * *' +- trigger: + name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 21 * * *' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 0 * * *' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 3 * * *' +- trigger: + name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 6 * * *' +- trigger: + name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 9 * * *' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-ericsson-pod2-brahmaputra-trigger' + triggers: - timed: '' +#----------------------------------------------- +# Triggers for other PODs +#----------------------------------------------- - trigger: name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod1-master-trigger' triggers: @@ -257,20 +335,12 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-brahmaputra-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger' triggers: - timed: '' # os-nosdn-kvm-ha trigger - trigger: - name: 'fuel-os-nosdn-kvm-ha-opnfv-jump-2-master-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-nosdn-kvm-ha-ericsson-pod1-master-trigger' triggers: - timed: '' @@ -291,20 +361,12 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-brahmaputra-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-nosdn-kvm-ha-virtual-brahmaputra-trigger' triggers: - timed: '' # os-odl_l2-nofeature-ha trigger - trigger: - name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-master-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-master-trigger' triggers: - timed: '' @@ -319,13 +381,9 @@ - trigger: name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-brahmaputra-trigger' triggers: - - timed: '0 4,10,16,22 * * *' -- trigger: - name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-brahmaputra-trigger' - triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-brahmaputra-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-brahmaputra-trigger' triggers: - timed: '' - trigger: @@ -335,10 +393,6 @@ # os-odl_l3-nofeature-ha trigger - trigger: - name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-master-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-master-trigger' triggers: - timed: '' @@ -359,20 +413,12 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-brahmaputra-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-odl_l3-nofeature-ha-virtual-brahmaputra-trigger' triggers: - timed: '' # os-onos-nofeature-ha trigger - trigger: - name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-master-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-master-trigger' triggers: - timed: '' @@ -393,10 +439,6 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-brahmaputra-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-onos-nofeature-ha-virtual-brahmaputra-trigger' triggers: - timed: '' @@ -404,10 +446,6 @@ # os-nosdn-ovs-ha trigger - trigger: - name: 'fuel-os-nosdn-ovs-ha-opnfv-jump-2-master-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-nosdn-ovs-ha-ericsson-pod1-master-trigger' triggers: - timed: '' @@ -428,20 +466,12 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-brahmaputra-trigger' - triggers: - - timed: '' -- 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: '' -- trigger: name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-master-trigger' triggers: - timed: '' @@ -462,20 +492,12 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-brahmaputra-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-brahmaputra-trigger' triggers: - timed: '' # os-odl_l2-sfc-ha trigger - trigger: - name: 'fuel-os-odl_l2-sfc-ha-opnfv-jump-2-master-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod1-master-trigger' triggers: - timed: '' @@ -496,20 +518,12 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod2-brahmaputra-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-odl_l2-sfc-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: '' @@ -530,10 +544,6 @@ 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: '' diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 90b5a67d4..a117dc814 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -88,6 +88,9 @@ - virtual: installer: joid <<: *master + - huawei-us-deploy-bare-2: + installer: compass + <<: *master #-------------------------------- testsuite: diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 9566651ff..f3c0ad4b1 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -123,6 +123,11 @@ suite: daily auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *master + - huawei-us-deploy-bare-2: + installer: compass + suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + <<: *master - virtual: installer: fuel suite: daily @@ -369,6 +374,14 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: + name: 'yardstick-params-huawei-us-deploy-bare-2' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '-i 104.197.68.199:8086' + description: 'Arguments to use in order to choose the backend DB' + +- parameter: name: 'yardstick-params-zte-build-1' parameters: - string: diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml index 6e4c178d4..f06bf7077 100644 --- a/jjb/yardstick/yardstick-project-jobs.yml +++ b/jjb/yardstick/yardstick-project-jobs.yml @@ -120,7 +120,7 @@ # install python packages easy_install -U setuptools - #python setup.py develop + easy_install -U pip pip install -r ci/requirements.txt pip install -e . |