diff options
Diffstat (limited to 'jjb/functest')
| -rwxr-xr-x[-rw-r--r--] | jjb/functest/functest-alpine.sh | 9 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yml | 13 | ||||
| -rw-r--r-- | jjb/functest/functest-project-jobs.yml | 17 | ||||
| -rwxr-xr-x | jjb/functest/set-functest-env.sh | 11 |
4 files changed, 37 insertions, 13 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index f0e08e171..57398faf6 100644..100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -68,9 +68,14 @@ volumes="${images_vol} ${results_vol} ${sshkey_vol} ${rc_file_vol} ${cacert_file set +e -tiers=(healthcheck smoke features vnf) +if [ ${FUNCTEST_SUITE_NAME} == 'healthcheck' ]; then + tiers=(healthcheck) +else + tiers=(healthcheck smoke features vnf) +fi + for tier in ${tiers[@]}; do - FUNCTEST_IMAGE=ollivier/functest-${tier} + FUNCTEST_IMAGE=opnfv/functest-${tier} echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..." docker pull ${FUNCTEST_IMAGE}>/dev/null cmd="docker run ${envs} ${volumes} ${FUNCTEST_IMAGE}" diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml index d34437265..b1d7e748d 100644 --- a/jjb/functest/functest-daily-jobs.yml +++ b/jjb/functest/functest-daily-jobs.yml @@ -364,10 +364,9 @@ name: functest-daily-builder builders: - 'functest-cleanup' - - 'set-functest-env' + - 'set-functest-env-alpine' - 'functest-daily' - 'functest-store-results' - - 'functest-exit' - builder: name: functest-suite-builder @@ -392,7 +391,7 @@ name: functest-daily builders: - shell: - !include-raw: ./functest-loop.sh + !include-raw: ./functest-alpine.sh - builder: @@ -411,6 +410,14 @@ - ./set-functest-env.sh - builder: + name: set-functest-env-alpine + builders: + - shell: + !include-raw: + - ./functest-env-presetup.sh + - ../../utils/fetch_os_creds.sh + +- builder: name: functest-store-results builders: - shell: diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml index 02da04f30..c25e4ab4a 100644 --- a/jjb/functest/functest-project-jobs.yml +++ b/jjb/functest/functest-project-jobs.yml @@ -35,17 +35,21 @@ disabled: '{obj:disabled}' + project-type: 'multijob' + parameters: - project-parameter: project: '{project}' branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - git-scm-gerrit triggers: - - 'functest-verify-triggers-macro' + - 'functest-verify-triggers-macro': + project: '{project}' + branch: '{branch}' builders: - shell: | @@ -98,6 +102,11 @@ disabled: '{obj:disabled}' + wrappers: + - ssh-agent-wrapper + - build-timeout: + timeout: 30 + parameters: - project-parameter: project: '{project}' @@ -128,7 +137,9 @@ - git-scm triggers: - - 'functest-docs-upload-triggers-macro' + - 'functest-docs-upload-triggers-macro': + project: '{project}' + branch: '{branch}' builders: - functest-upload-doc-artifact diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index f18f054a5..bb79dacbe 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -51,14 +51,15 @@ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \ -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG} -e DEPLOY_TYPE=${DEPLOY_TYPE}" -if [[ ${INSTALLER_TYPE} == 'fuel' && ! -z ${SALT_MASTER_IP} ]]; then - HOST_ARCH=$(ssh -l ubuntu ${SALT_MASTER_IP} -i ${SSH_KEY} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \ - "sudo salt 'cmp*' grains.get cpuarch --out yaml |awk '{print \$2; exit}'") - envs="${envs} -e POD_ARCH=${HOST_ARCH}" +ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" + +if [ "${INSTALLER_TYPE}" == 'fuel' ] && [ "$BRANCH" != 'stable/danube' ]; 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}'") + envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}" fi if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} == *'os-nosdn-openo-ha'* ]]; then - ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" openo_msb_port=${openo_msb_port:-80} openo_msb_endpoint="$(sshpass -p'root' ssh 2>/dev/null $ssh_options root@${installer_ip} \ 'mysql -ucompass -pcompass -Dcompass -e "select package_config from cluster;" \ |