diff options
| -rwxr-xr-x | jjb/cperf/cperf-robot-netvirt-csit.sh | 4 | ||||
| -rw-r--r-- | jjb/functest/functest-virtual.yaml | 46 |
2 files changed, 48 insertions, 2 deletions
diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh index 892f0aa7a..fe5d57879 100755 --- a/jjb/cperf/cperf-robot-netvirt-csit.sh +++ b/jjb/cperf/cperf-robot-netvirt-csit.sh @@ -90,7 +90,7 @@ fi # Upload glance image into openstack wget -O ${WORKSPACE}/cirros-0.3.5-x86_64-disk.img http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img export ANSIBLE_HOST_KEY_CHECKING=False -ansible-playbook -i ${CONTROLLER_1_IP}, -u heat-admin --key-file ${WORKSPACE}/id_rsa ${REL_PATH}/cirros-upload.yaml.ansible -vvv +ansible-playbook -i ${CONTROLLER_1_IP}, -u heat-admin --key-file ${WORKSPACE}/id_rsa ${REL_PATH}/cirros-upload.yaml.ansible --ssh-extra-args='-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' -vvv LOGS_LOCATION=/tmp/robot_results @@ -185,4 +185,4 @@ docker run -i --net=host \ ${robot_cmd} ${suites};" echo "Running post CSIT clean" -ansible-playbook -i ${CONTROLLER_1_IP}, -u heat-admin --key-file ${WORKSPACE}/id_rsa ${REL_PATH}/csit-clean.yaml.ansible -vvv +ansible-playbook -i ${CONTROLLER_1_IP}, -u heat-admin --key-file ${WORKSPACE}/id_rsa ${REL_PATH}/csit-clean.yaml.ansible --ssh-extra-args='-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' -vvv diff --git a/jjb/functest/functest-virtual.yaml b/jjb/functest/functest-virtual.yaml index 2cff9fd52..79f551e30 100644 --- a/jjb/functest/functest-virtual.yaml +++ b/jjb/functest/functest-virtual.yaml @@ -403,6 +403,42 @@ ref: $GERRIT_REFSPEC <<: *functest-buildparameters +- builder: + name: run-tox + builders: + - shell: tox + +- job-template: + name: '{repo}-functest-{tag}-ut-gate' + <<: *functest-gateparameters + scm: + - functest-scm: + ref: $GERRIT_REFSPEC + builders: + - run-tox: + ref: $GERRIT_REFSPEC + repo: '{repo}' + tag: '{tag}' + +- job-template: + name: '{repo}-functest-{tag}-ut-check' + <<: *functest-checkparameters + scm: + - functest-scm: + ref: $BRANCH + builders: + - run-tox: + ref: $BRANCH + repo: '{repo}' + tag: '{tag}' + +- project: + name: repo-functest-tag-ut-build + <<: *functest-defaultparameters + jobs: + - '{repo}-functest-{tag}-ut-gate' + - '{repo}-functest-{tag}-ut-check' + - job-template: name: '{repo}-functest-{container}-{tag}-check' <<: *functest-checkparameters @@ -452,6 +488,11 @@ - '{repo}-functest-.*-.*' builders: - multijob: + name: run tox + projects: + - name: '{repo}-functest-{tag}-ut-gate' + <<: *functest-projectparameters + - multijob: name: remove advanced functest containers <<: *functest-advcontainers-rmi - multijob: @@ -518,6 +559,11 @@ - '{repo}-functest-.*-.*' builders: - multijob: + name: run tox + projects: + - name: '{repo}-functest-{tag}-ut-check' + <<: *functest-projectparameters + - multijob: name: remove advanced functest containers <<: *functest-advcontainers-rmi - multijob: |