diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2017-02-21 21:48:52 +0100 |
|---|---|---|
| committer | jose.lausuch <jose.lausuch@ericsson.com> | 2017-02-21 22:15:52 +0100 |
| commit | 9f0f57dc8095e706eebe69c321f12c9a2176e169 (patch) | |
| tree | c273896bb46be0167c3383827ae522607670931c | |
| parent | 914c2788ae0f240c1a7a4e060213c531a602d6c7 (diff) | |
[Functest] Refactor Functest-suite job
- Remove if clauses for old releases (not used any more)
- Use python call to run_tests.py instead of CLI
This will allow us to return the proper value to
the job. The CLI command returns always 0.
- Remove push logs to artifacts
Functest-suite is not meant for daily CI runs
Change-Id: I34d99cbe5af07a1fcf583a9a0b6ac6ab286c9adc
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 2 | ||||
| -rwxr-xr-x | jjb/functest/functest-suite.sh | 27 |
2 files changed, 13 insertions, 16 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 49901bea2..b3348c7e9 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -347,8 +347,6 @@ - 'functest-cleanup' - 'set-functest-env' - 'functest-suite' - - 'functest-store-results' - - 'functest-exit' - builder: name: functest-daily diff --git a/jjb/functest/functest-suite.sh b/jjb/functest/functest-suite.sh index f28d3d037..228cc3da4 100755 --- a/jjb/functest/functest-suite.sh +++ b/jjb/functest/functest-suite.sh @@ -1,19 +1,18 @@ #!/bin/bash -set -e -echo "Functest: run $FUNCTEST_SUITE_NAME on branch $BRANCH" -if [[ "$BRANCH" =~ 'brahmaputra' ]]; then - cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME" -elif [[ "$BRANCH" =~ 'colorado' ]]; then - cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME" -else - cmd="functest testcase run $FUNCTEST_SUITE_NAME" -fi container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) -docker exec $container_id $cmd +if [ -z $container_id ]; then + echo "Functest container not found" + exit 1 +fi + +global_ret_val=0 -ret_value=$? -ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" -echo ${ret_value}>${ret_val_file} +tests=($(echo $FUNCTEST_SUITE_NAME | tr "," "\n")) +for test in ${tests[@]}; do + cmd="python /home/opnfv/repos/functest/functest/ci/run_tests.py -t $test" + docker exec $container_id $cmd + let global_ret_val+=$? +done -exit 0 +exit $global_ret_val |