diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-09-08 08:34:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-08 08:34:05 +0000 |
| commit | e451a2c7a5eec25624d2ec6d5f23f123038f88d9 (patch) | |
| tree | 772aae732f79d191b67dea7cd7164c9c0ad3975d | |
| parent | 68cad8a9b95b97ec58ba763abf11bdcfb4e0b1db (diff) | |
| parent | cc53c861eb550b7fb882212f4abd6c0c63ba0f71 (diff) | |
Merge "Add functest-healthcheck alpine to xci-verify-healthcheck-macro"
| -rwxr-xr-x[-rw-r--r--] | jjb/functest/functest-alpine.sh | 7 | ||||
| -rw-r--r-- | jjb/xci/xci-verify-jobs.yml | 8 | ||||
| -rwxr-xr-x | utils/fetch_os_creds.sh | 4 |
3 files changed, 14 insertions, 5 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index cee302699..9be9fe57f 100644..100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -68,7 +68,12 @@ 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=opnfv/functest-${tier} echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..." diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml index 61d25585c..5fca9bdbb 100644 --- a/jjb/xci/xci-verify-jobs.yml +++ b/jjb/xci/xci-verify-jobs.yml @@ -217,7 +217,7 @@ - builder: name: 'xci-verify-healthcheck-macro' builders: - - shell: | - #!/bin/bash - - echo "Hello World!" + - shell: + !include-raw: ../../utils/fetch_os_creds.sh + - shell: + !include-raw: ../functest/functest-alpine.sh diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh index 54b2b45df..3bc66f942 100755 --- a/utils/fetch_os_creds.sh +++ b/utils/fetch_os_creds.sh @@ -243,6 +243,10 @@ elif [ "$installer_type" == "daisy" ]; then sshpass -p r00tme scp 2>/dev/null $ssh_options root@${installer_ip}:/etc/kolla/admin-openrc.sh $dest_path &> /dev/null +elif ["$installer_type" == "osa"]; then + # Get RC file from control server + filename=$(ssh -o StrictHostKeyChecking=no root@${controller_ip} find /var/lib/lxc/controller00_nova_api_placement_container-* -name openrc) + scp root@${controller_ip}:${filename} ${destpath} else error "Installer $installer is not supported by this script" fi |