diff options
| -rw-r--r-- | jjb/fuel/fuel-daily-jobs.yaml | 8 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 4 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yaml | 9 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 60 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-daily-jobs.yaml | 13 | ||||
| -rw-r--r-- | utils/push-test-logs.sh | 1 |
6 files changed, 88 insertions, 7 deletions
diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml index 79a392b11..50c82a9cc 100644 --- a/jjb/fuel/fuel-daily-jobs.yaml +++ b/jjb/fuel/fuel-daily-jobs.yaml @@ -437,11 +437,11 @@ - trigger: name: 'fuel-os-odl-sfc-noha-virtual-daily-master-trigger' triggers: - - timed: '5 4 * * *' + - timed: '5 4 * * 1,4' - trigger: name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-master-trigger' triggers: - - timed: '5 6 * * *' + - timed: '5 6 * * 2,5' - trigger: name: 'fuel-os-ovn-nofeature-noha-virtual-daily-master-trigger' triggers: @@ -497,11 +497,11 @@ - trigger: name: 'fuel-os-odl-sfc-noha-virtual-daily-hunter-trigger' triggers: - - timed: '0 4 * * *' + - timed: '0 4 * * 1,4' - trigger: name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-hunter-trigger' triggers: - - timed: '0 7 * * *' + - timed: '0 7 * * 2,5' - trigger: name: 'fuel-os-ovn-nofeature-noha-virtual-daily-hunter-trigger' triggers: diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index 418b814e5..dd89447e6 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -19,8 +19,8 @@ LAB_NAME=${NODE_NAME/-*} # shellcheck disable=SC2153 POD_NAME=${NODE_NAME/*-} -# Fuel currently supports arm, enea, ericsson, intel, lf, unh and zte labs -if [[ ! "${LAB_NAME}" =~ (arm|enea|ericsson|intel|lf|unh|zte) ]]; then +# Fuel currently supports arm, enea, ericsson, intel, lf, unh, zte and itri labs +if [[ ! "${LAB_NAME}" =~ (arm|enea|ericsson|intel|lf|unh|zte|itri) ]]; then echo "Unsupported/unidentified lab ${LAB_NAME}. Cannot continue!" exit 1 fi diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 45f1e0553..aefc214cc 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -91,6 +91,15 @@ slave-label: armband-baremetal installer: fuel <<: *hunter + # fuel NONE CI PODs + - zte-pod1: + slave-label: fuel-baremetal + installer: fuel + <<: *master + - itri-pod1: + slave-label: fuel-baremetal + installer: fuel + <<: *master testsuite: - 'suite': diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 074ad737b..4a60c6484 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -103,7 +103,6 @@ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ -e DEBUG=True \ -e EXTERNAL_NETWORK=public \ - -e DEBUG=true \ -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \ -v /home/opnfv/functest/images:/home/opnfv/functest/images \ -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python2.7/\ @@ -265,6 +264,9 @@ - neutron-tempest-plugin-api - rally_sanity - refstack_defcore + - refstack_compute + - refstack_object + - refstack_platform - tempest_full - tempest_scenario - patrole @@ -272,6 +274,17 @@ - networking-bgpvpn - networking-sfc - barbican + exclude: + - tag: latest + test: refstack_defcore + - tag: iruya + test: refstack_defcore + - tag: hunter + test: refstack_compute + - tag: hunter + test: refstack_object + - tag: hunter + test: refstack_platform jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -356,6 +369,8 @@ <<: *functest-jobs - multijob: name: opnfv/functest-healthcheck:{tag} + execution-type: PARALLEL + condition: ALWAYS projects: - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run' <<: *functest-jobs @@ -383,6 +398,8 @@ <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} + execution-type: PARALLEL + condition: SUCCESSFUL projects: - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs @@ -390,6 +407,12 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-refstack_compute-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-refstack_object-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-refstack_platform-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run' @@ -406,6 +429,8 @@ <<: *functest-jobs - multijob: name: opnfv/functest-benchmarking:{tag} + execution-type: PARALLEL + condition: ALWAYS projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run' <<: *functest-jobs @@ -418,6 +443,7 @@ - multijob: name: opnfv/functest-vnf:{tag} execution-type: SEQUENTIALLY + condition: ALWAYS projects: - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run' <<: *functest-jobs @@ -431,6 +457,8 @@ <<: *functest-jobs - multijob: name: opnfv/functest-features:{tag} + execution-type: PARALLEL + condition: ALWAYS projects: - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run' <<: *functest-jobs @@ -624,6 +652,8 @@ <<: *functest-jobs - multijob: name: opnfv/functest-healthcheck:{tag} + execution-type: PARALLEL + condition: ALWAYS projects: - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run' <<: *functest-jobs @@ -651,6 +681,8 @@ <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} + execution-type: PARALLEL + condition: SUCCESSFUL projects: - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs @@ -658,6 +690,12 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-refstack_compute-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-refstack_object-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-refstack_platform-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run' @@ -674,6 +712,8 @@ <<: *functest-jobs - multijob: name: opnfv/functest-benchmarking:{tag} + execution-type: PARALLEL + condition: ALWAYS projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run' <<: *functest-jobs @@ -686,6 +726,7 @@ - multijob: name: opnfv/functest-vnf:{tag} execution-type: SEQUENTIALLY + condition: ALWAYS projects: - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run' <<: *functest-jobs @@ -699,6 +740,8 @@ <<: *functest-jobs - multijob: name: opnfv/functest-features:{tag} + execution-type: PARALLEL + condition: ALWAYS projects: - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run' <<: *functest-jobs @@ -798,6 +841,8 @@ <<: *functest-jobs - multijob: name: opnfv/functest-healthcheck:{tag} + execution-type: PARALLEL + condition: ALWAYS projects: - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run' <<: *functest-jobs @@ -825,6 +870,8 @@ <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} + execution-type: PARALLEL + condition: SUCCESSFUL projects: - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs @@ -832,6 +879,12 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-refstack_compute-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-refstack_object-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-refstack_platform-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run' @@ -848,6 +901,8 @@ <<: *functest-jobs - multijob: name: opnfv/functest-benchmarking:{tag} + execution-type: PARALLEL + condition: ALWAYS projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run' <<: *functest-jobs @@ -860,6 +915,7 @@ - multijob: name: opnfv/functest-vnf:{tag} execution-type: SEQUENTIALLY + condition: ALWAYS projects: - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run' <<: *functest-jobs @@ -873,6 +929,8 @@ <<: *functest-jobs - multijob: name: opnfv/functest-features:{tag} + execution-type: PARALLEL + condition: ALWAYS projects: - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run' <<: *functest-jobs diff --git a/jjb/yardstick/yardstick-daily-jobs.yaml b/jjb/yardstick/yardstick-daily-jobs.yaml index bab3ce9c5..8c3ba85eb 100644 --- a/jjb/yardstick/yardstick-daily-jobs.yaml +++ b/jjb/yardstick/yardstick-daily-jobs.yaml @@ -158,6 +158,11 @@ installer: joid auto-trigger-name: 'daily-trigger-disabled' <<: *master + - itri-pod1: + slave-label: '{pod}' + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *master - zte-pod1: slave-label: '{pod}' installer: fuel @@ -446,6 +451,14 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: + name: 'yardstick-params-itri-pod1' + 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-pod1' parameters: - string: diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh index 3a8b71856..62c964da7 100644 --- a/utils/push-test-logs.sh +++ b/utils/push-test-logs.sh @@ -24,6 +24,7 @@ node_list=(\ 'lf-pod1' 'lf-pod2' \ 'lf-virtual2' 'lf-virtual3' \ 'intel-pod12' 'intel-pod18' \ +'itri-pod1' \ 'ericsson-pod1' 'ericsson-pod2' \ 'ericsson-virtual1' 'ericsson-virtual2' 'ericsson-virtual3' \ 'ericsson-virtual4' 'ericsson-virtual5' \ |