diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 38 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 4 | ||||
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 13 |
3 files changed, 51 insertions, 4 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 77b711e74..acfcedabf 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -43,6 +43,8 @@ <<: *master - virtual: <<: *master + - zte-pod1: + <<: *master #-------------------------------- # scenarios #-------------------------------- @@ -311,6 +313,42 @@ name: 'fuel-os-nosdn-kvm-noha-ericsson-pod2-brahmaputra-trigger' triggers: - timed: '' + +#----------------------------------------------- +# ZTE POD1 Triggers running against master branch +#----------------------------------------------- +- trigger: + name: 'fuel-os-nosdn-nofeature-ha-zte-pod1-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-nofeature-ha-zte-pod1-master-trigger' + triggers: + - timed: '0 12 * * *' +- trigger: + name: 'fuel-os-odl_l3-nofeature-ha-zte-pod1-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-onos-nofeature-ha-zte-pod1-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod1-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-zte-pod1-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-kvm-ha-zte-pod1-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-ovs-ha-zte-pod1-master-trigger' + triggers: + - timed: '' #----------------------------------------------- # Triggers for other PODs #----------------------------------------------- diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index bab6151d8..ceccc54b6 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -43,8 +43,8 @@ if [[ "$NODE_NAME" =~ "virtual" ]]; then POD_NAME="virtual_kvm" fi -# we currently support ericsson, intel, and lf labs -if [[ ! "$LAB_NAME" =~ (ericsson|intel|lf) ]]; then +# we currently support ericsson, intel, lf and zte labs +if [[ ! "$LAB_NAME" =~ (ericsson|intel|lf|zte) ]]; then echo "Unsupported/unidentified lab $LAB_NAME. Cannot continue!" exit 1 else diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 6cfcfdca4..cd3f11e8e 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -218,12 +218,20 @@ builders: - 'functest-cleanup' - 'set-functest-env' - - 'functest-all' + - 'functest-daily' - 'functest-store-results' - builder: name: functest-suite-builder builders: + - 'functest-cleanup' + - 'set-functest-env' + - 'functest-suite' + + +- builder: + name: functest-suite + builders: - shell: | #!/bin/bash set -e @@ -237,8 +245,9 @@ container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd + - builder: - name: functest-all + name: functest-daily builders: - shell: | #!/bin/bash |