Merge "Add functest-healthcheck alpine to xci-verify-healthcheck-macro"

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
old mode 100644 (file)
new mode 100755 (executable)
index cee3026..9be9fe5
--- 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 61d2558..5fca9bd 100644 (file)
--- 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 54b2b45..3bc66f9 100755 (executable)
--- 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