X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-ci-jobs.yml;h=79a5cabe11a9435a8cdc4cf6f388816c4f32048f;hb=66f24c075ee0202ce0a70dfba9276d161b2d3ad8;hp=49d29cbbec1dc880fb2279c232711b553344618f;hpb=4e7817a8de6a17186ea661c561c03b93d2f36a55;p=releng.git diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 49d29cbbe..79a5cabe1 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -13,49 +13,87 @@ stream: master branch: '{stream}' gs-pathname: '' + docker-tag: 'latest' brahmaputra: &brahmaputra stream: brahmaputra branch: 'stable/{stream}' gs-pathname: '/{stream}' + docker-tag: 'stable' #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- # brahmaputra #-------------------------------- pod: - - opnfv-jump-2: - installer: fuel + - opnfv-jump-1: + installer: apex <<: *brahmaputra - intel-pod5: installer: joid <<: *brahmaputra + - orange-pod2: + installer: joid + <<: *brahmaputra - huawei-us-deploy-bare-1: installer: compass <<: *brahmaputra + - ericsson-pod1: + installer: fuel + <<: *brahmaputra + - ericsson-pod2: + installer: fuel + <<: *brahmaputra + - opnfv-jump-2: + installer: fuel + <<: *brahmaputra + - virtual: + installer: fuel + <<: *brahmaputra + - huawei-virtual: + installer: compass + <<: *brahmaputra + - virtual: + installer: joid + <<: *brahmaputra #-------------------------------- # master #-------------------------------- + - opnfv-jump-2: + installer: fuel + <<: *master - intel-pod6: installer: joid <<: *master - intel-pod8: installer: compass <<: *master - - opnfv-jump-1: + - intel-pod7: installer: apex <<: *master - ericsson-pod1: installer: fuel <<: *master - - ericsson-pod2: - installer: fuel - <<: *master - orange-test1: installer: fuel <<: *master - orange-pod2: installer: joid <<: *master + - virtual: + installer: fuel + <<: *master + - huawei-virtual: + installer: compass + <<: *master + - virtual: + installer: joid + <<: *master + - huawei-us-deploy-bare-2: + installer: compass + <<: *master + - nokia-pod1: + installer: apex + <<: *master #-------------------------------- testsuite: @@ -71,9 +109,19 @@ - job-template: name: 'functest-{installer}-{pod}-{testsuite}-{stream}' + concurrent: true + + properties: + - throttle: + enabled: true + max-per-node: 1 + wrappers: - build-name: name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO' + - timeout: + timeout: 400 + abort: true parameters: - project-parameter: @@ -81,6 +129,13 @@ - '{pod}-defaults' - '{installer}-defaults' - 'functest-{testsuite}-parameter' + - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-nofeature-ha' + - string: + name: DOCKER_TAG + default: '{docker-tag}' + description: 'Tag to pull docker image' - functest-parameter: gs-pathname: '{gs-pathname}' @@ -91,6 +146,8 @@ branch: '{branch}' builders: + - 'functest-cleanup' + - 'set-functest-env' - 'functest-{testsuite}-builder' ######################## @@ -112,8 +169,13 @@ - 'tempest' - 'rally' - 'odl' + - 'onos' + - 'ovno' + - 'promise' + - 'doctor' - 'vims' - - 'vping' + - 'vping_userdata' + - 'vping_ssh' - parameter: name: functest-parameter parameters: @@ -158,12 +220,10 @@ - shell: | #!/bin/bash set +e - flag="" - if [ "${PUSH_RESULTS_TO_DB}" == "true" ]; then - flag="-r" - fi + flags="-s" + [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+=" -r" echo "Functest: run $FUNCTEST_SUITE_NAME" - cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME ${flag}" + cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME ${flags}" container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd @@ -173,12 +233,9 @@ - shell: | #!/bin/bash set +e - flag="" - if [ "${PUSH_RESULTS_TO_DB}" == "true" ]; then - flag="-r" - fi - echo "Functest: running all the tests" - cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh ${flag}" + flags="-s" + [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+=" -r" + cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh ${flags}" container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd @@ -192,8 +249,16 @@ # labconfig is used only for joid labconfig="" if [[ ${INSTALLER_TYPE} == 'apex' ]]; then - instack_mac=$(sudo virsh domiflist instack | grep default | \ - grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+") + if sudo virsh list | grep instack; then + instack_mac=$(sudo virsh domiflist instack | grep default | \ + grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+") + elif sudo virsh list | grep undercloud; then + instack_mac=$(sudo virsh domiflist undercloud | grep default | \ + grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+") + else + echo "No available installer VM exists...exiting" + exit 1 + fi INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'}) sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa" sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable @@ -208,20 +273,22 @@ echo "Functest: Start Docker and prepare environment" envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \ - -e CI_DEBUG=${CI_DEBUG}" - - dir_result="${HOME}/opnfv/functest/reports" + -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG}" + branch=${GIT_BRANCH##*/} + dir_result="${HOME}/opnfv/functest/results/${branch}" mkdir -p ${dir_result} sudo rm -rf ${dir_result}/* res_volume="-v ${dir_result}:/home/opnfv/functest/results" - docker pull opnfv/functest:latest_stable >$redirect - cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest_stable /bin/bash" + echo "Functest: Pulling image opnfv/functest:${DOCKER_TAG}" + docker pull opnfv/functest:$DOCKER_TAG >${redirect} + + cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:${DOCKER_TAG} /bin/bash" echo "Functest: Running docker run command: ${cmd}" - ${cmd} + ${cmd} >${redirect} docker ps -a sleep 5 - container_id=$(docker ps | grep 'opnfv/functest:latest_stable' | awk '{print $1}' | head -1) + container_id=$(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | awk '{print $1}' | head -1) echo "Container ID=${container_id}" if [ -z ${container_id} ]; then echo "Cannot find opnfv/functest container ID ${container_id}. Please check if it is existing." @@ -232,7 +299,7 @@ docker start ${container_id} sleep 5 docker ps - if [ $(docker ps | grep 'opnfv/functest:latest_stable' | wc -l) == 0 ]; then + if [ $(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | wc -l) == 0 ]; then echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..." exit 1 fi @@ -244,7 +311,7 @@ name: functest-store-results builders: - shell: - !include-raw: res-build.sh + !include-raw: ../../utils/push-test-logs.sh - builder: name: functest-cleanup @@ -257,7 +324,7 @@ # Remove previous running containers if exist if [[ ! -z $(docker ps -a | grep opnfv/functest) ]]; then echo "Removing existing opnfv/functest containers..." - docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm -f >$redirect + docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm -f >${redirect} fi # Remove existing images if exist @@ -267,6 +334,6 @@ image_tags=($(docker images | grep opnfv/functest | awk '{print $2}')) for tag in "${image_tags[@]}"; do echo "Removing docker image opnfv/functest:$tag..." - docker rmi opnfv/functest:$tag >$redirect + docker rmi opnfv/functest:$tag >${redirect} done fi