X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-ci-jobs.yml;h=42dd6df1762a389115959065332ababd0ffdc00d;hb=223f380a4e76c576a816b3b532ef67a1265e9a80;hp=df57efbb67e038199cb7d32e16c16b4f55b375d0;hpb=ba06278878eee3f4ee3b744669214a59e22deae7;p=releng.git diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index df57efbb6..42dd6df17 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -20,22 +20,41 @@ #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- -# Current Mapping -#-------------------------------- -# everything runs against master branch +# brahmaputra #-------------------------------- pod: + - opnfv-jump-2: + installer: fuel + <<: *brahmaputra + - intel-pod5: + installer: joid + <<: *brahmaputra - huawei-us-deploy-bare-1: installer: compass - <<: *master - - intel-pod5: + <<: *brahmaputra + - ericsson-pod1: + installer: fuel + <<: *brahmaputra + - virtual: + installer: fuel + <<: *brahmaputra + - virtual: + installer: compass + <<: *brahmaputra + - virtual: + installer: joid + <<: *brahmaputra +#-------------------------------- +# master +#-------------------------------- + - intel-pod6: installer: joid <<: *master - - intel-us-deploy-virtual-2: - installer: apex + - intel-pod8: + installer: compass <<: *master - - opnfv-jump-2: - installer: fuel + - opnfv-jump-1: + installer: apex <<: *master - ericsson-pod1: installer: fuel @@ -49,45 +68,15 @@ - orange-pod2: installer: joid <<: *master -#-------------------------------- -# Milestone E Mapping -# !!!DO NOT ENABLE!!! -#-------------------------------- -# brahmaputra -#-------------------------------- -# - huawei-us-deploy-bare-1: -# installer: compass -# <<: *brahmaputra -# - intel-pod5: -# installer: joid -# <<: *brahmaputra -# - opnfv-jump-1: -# installer: apex -# <<: *brahmaputra -# - opnfv-jump-2: -# installer: fuel -# <<: *brahmaputra -#-------------------------------- -# master -#-------------------------------- -# - ericsson-pod2: -# installer: fuel -# <<: *master -# - intelpod2-jumphost: -# installer: apex -# <<: *master -# - intel-pod6: -# installer: joid -# <<: *master -# - intel-pod8: -# installer: compass -# <<: *master -# - orange-test1: -# installer: fuel -# <<: *master -# - orange-pod2: -# installer: joid -# <<: *master + - virtual: + installer: fuel + <<: *master + - virtual: + installer: compass + <<: *master + - virtual: + installer: joid + <<: *master #-------------------------------- testsuite: @@ -105,7 +94,7 @@ wrappers: - build-name: - name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME SDN: $SDN_CONTROLLER Feature: $OPNFV_FEATURE' + name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO' parameters: - project-parameter: @@ -113,6 +102,9 @@ - '{pod}-defaults' - '{installer}-defaults' - 'functest-{testsuite}-parameter' + - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-nofeature-ha' - functest-parameter: gs-pathname: '{gs-pathname}' @@ -144,6 +136,10 @@ - 'tempest' - 'rally' - 'odl' + - 'onos' + - 'ovno' + - 'promise' + - 'doctor' - 'vims' - 'vping' - parameter: @@ -161,13 +157,18 @@ name: PUSH_RESULTS_TO_DB default: "true" description: "Push the results of all the tests to the resultDB" + - string: + name: CI_DEBUG + default: 'false' + description: "Show debug output information" ######################## # trigger macros ######################## - trigger: name: 'functest-master' triggers: - - pollscm: "H 9 * * *" + - pollscm: + cron: "H 9 * * *" ######################## # builder macros ######################## @@ -215,34 +216,35 @@ - shell: | #!/bin/bash set +e + [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" # labconfig is used only for joid labconfig="" if [[ ${INSTALLER_TYPE} == 'apex' ]]; then - INSTALLER_IP=$(grep instack /var/lib/libvirt/dnsmasq/default.leases \ - |awk '{print $3}' | head -n 1) + 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]+") + 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 sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then # If production lab then creds may be retrieved dynamically # creds are on the jumphost, always in the same folder - labconfig="-v /var/lib/jenkins/joid_config/admin-openrc:/home/opnfv/functest/conf/openstack.creds" + labconfig="-v $LAB_CONFIG/admin-openrc:/home/opnfv/functest/conf/openstack.creds" # If dev lab, credentials may not be the default ones, just provide a path to put them into docker # replace the default one by the customized one provided by jenkins config - if [ -n "${LAB_CONFIG}" ]; then - labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds" - fi fi echo "Functest: Start Docker and prepare environment" - envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}" + 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" - mkdir -f ${dir_result} - rm -rf ${dir_result}/* - $res_volume="-v ${dir_result}:/home/opnfv/functest/results" + mkdir -p ${dir_result} + sudo rm -rf ${dir_result}/* + res_volume="-v ${dir_result}:/home/opnfv/functest/results" - docker pull opnfv/functest:latest_stable - cmd="docker run -id -e $envs ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest_stable /bin/bash" + 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: Running docker run command: ${cmd}" ${cmd} docker ps -a @@ -270,21 +272,20 @@ name: functest-store-results builders: - shell: - !include-raw res-build.sh + !include-raw: res-build.sh - builder: name: functest-cleanup builders: - shell: | #!/bin/bash + [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" echo "Cleaning up docker containers/images..." - # Remove previous running containers if exist if [[ ! -z $(docker ps -a | grep opnfv/functest) ]]; then echo "Removing existing opnfv/functest containers..." - docker ps | grep opnfv/functest | awk '{print $1}' | xargs docker stop - docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm + docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm -f >$redirect fi # Remove existing images if exist @@ -294,6 +295,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 + docker rmi opnfv/functest:$tag >$redirect done fi