diff options
Diffstat (limited to 'jjb/functest')
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 28 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yaml | 20 | ||||
| -rw-r--r-- | jjb/functest/functest-project-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/functest/functest-rtd-jobs.yaml | 13 |
4 files changed, 53 insertions, 10 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index da167358a..f0733b641 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -8,6 +8,7 @@ REPO=${REPO:-opnfv} CI_LOOP=${CI_LOOP:-daily} TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results ENERGY_RECORDER_API_URL=http://energy.opnfv.fr/resources +DOCKER_TAG=${DOCKER_TAG:-$([[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/})} check_os_deployment() { FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} @@ -42,6 +43,7 @@ run_tiers() { echo ${ret_value} > ${ret_val_file} if [ ${tier} == 'healthcheck' ]; then echo "Healthcheck tier failed. Exiting Functest..." + skip_tests=1 break fi fi @@ -87,7 +89,6 @@ FUNCTEST_DIR=/home/opnfv/functest DEPLOY_TYPE=baremetal [[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt HOST_ARCH=$(uname -m) -DOCKER_TAG=`[[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/}` # Prepare OpenStack credentials volume rc_file=${HOME}/opnfv-openrc.sh @@ -131,12 +132,15 @@ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" +if [[ "${INSTALLER_TYPE}" == 'apex' ]] || [[ "${INSTALLER_TYPE}" == 'compass' ]]; then + envs="${envs} -e STORAGE_PROTOCOL=ceph" +fi if [ "${INSTALLER_TYPE}" == 'fuel' ]; then COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \ "sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'") IMAGE_PROPERTIES="hw_disk_bus:scsi,hw_scsi_model:virtio-scsi" - envs="${envs} -e POD_ARCH=${COMPUTE_ARCH} -e IMAGE_PROPERTIES=${IMAGE_PROPERTIES}" + envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}" fi if [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_SCENARIO} == 'os-nosdn-nofeature-noha' ]]; then @@ -156,12 +160,15 @@ fi if [[ ${DEPLOY_SCENARIO} == *"ovs"* ]] || [[ ${DEPLOY_SCENARIO} == *"fdio"* ]]; then if [[ -n ${IMAGE_PROPERTIES} ]]; then - IMAGE_PROPERTIES="${IMAGE_PROPERTIES}, hw_mem_page_size: large" + IMAGE_PROPERTIES="${IMAGE_PROPERTIES},hw_mem_page_size:large" else - IMAGE_PROPERTIES="hw_mem_page_size: large" + IMAGE_PROPERTIES="hw_mem_page_size:large" fi - FLAVOR_EXTRA_SPECS="hw:mem_page_size: large" - envs="${envs} -e IMAGE_PROPERTIES=\"${IMAGE_PROPERTIES}\" -e FLAVOR_EXTRA_SPECS=\"${FLAVOR_EXTRA_SPECS}\"" + FLAVOR_EXTRA_SPECS="hw:mem_page_size:large" +fi + +if [[ -n ${IMAGE_PROPERTIES} ]] || [[ -n ${FLAVOR_EXTRA_SPECS} ]]; then + envs="${envs} -e IMAGE_PROPERTIES=${IMAGE_PROPERTIES} -e FLAVOR_EXTRA_SPECS=${FLAVOR_EXTRA_SPECS}" fi volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}" @@ -180,6 +187,7 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then run_tiers ${tiers} else tests=(tempest_full tempest_scenario) + skip_tests=0 if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features vnf parser) @@ -196,7 +204,9 @@ else fi fi run_tiers ${tiers} - for test in "${tests[@]}"; do - run_test "$test" - done + if [ ${skip_tests} -eq 0 ]; then + for test in "${tests[@]}"; do + run_test "$test" + done + fi fi diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 27cd0ac26..8d3883a0f 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -102,6 +102,18 @@ slave-label: compass-arm-virtual installer: compass <<: *fraser + - baremetal: + slave-label: compass-baremetal + installer: compass + <<: *gambia + - virtual: + slave-label: compass-virtual + installer: compass + <<: *gambia + - arm-virtual: + slave-label: compass-arm-virtual + installer: compass + <<: *gambia # apex CI PODs - virtual: slave-label: apex-virtual-master @@ -112,6 +124,14 @@ installer: apex <<: *master - virtual: + slave-label: apex-virtual-master + installer: apex + <<: *gambia + - baremetal: + slave-label: apex-baremetal-master + installer: apex + <<: *gambia + - virtual: slave-label: apex-virtual-fraser installer: apex <<: *fraser diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml index b7220a83c..e9a65b495 100644 --- a/jjb/functest/functest-project-jobs.yaml +++ b/jjb/functest/functest-project-jobs.yaml @@ -114,7 +114,7 @@ wrappers: - ssh-agent-wrapper - build-timeout: - timeout: 30 + timeout: 60 parameters: - project-parameter: diff --git a/jjb/functest/functest-rtd-jobs.yaml b/jjb/functest/functest-rtd-jobs.yaml new file mode 100644 index 000000000..e45338262 --- /dev/null +++ b/jjb/functest/functest-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: functest-rtd + project: functest + project-name: functest + + gerrit-skip-vote: true + project-pattern: 'functest' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-functest/47369/' + rtd-token: '26f9131bd5c337928ba8b431a289f6850b330504' + + jobs: + - '{project-name}-rtd-jobs' |