summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-x[-rw-r--r--]jjb/functest/functest-alpine.sh9
-rw-r--r--jjb/xci/xci-verify-jobs.yml8
-rwxr-xr-xutils/fetch_os_creds.sh4
3 files changed, 15 insertions, 6 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index f0e08e171..9be9fe57f 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/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 8d1ee55a4..6913c1f0b 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -220,7 +220,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 312e1ac5c..3d5d8a5fe 100755
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -231,6 +231,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