Add volume to get joid creds for production CI

[releng.git] / jjb / functest / functest.yml

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index c77a1fa..346b678 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -16,7 +16,7 @@
         - orange-pod2:
             installer: joid
         - huawei-us-deploy-bare-1:
-            installer: compass4nfv
+            installer: compass
         - intel-pod5:
             installer: joid
 
@@ -152,7 +152,7 @@
         - 'functest-cleanup'
         - 'set-functest-env'
         - 'functest-all'
-#        - 'functest-store-results'
+        - 'functest-store-results'
 
 - builder:
     name: functest-suite-builder
@@ -190,22 +190,34 @@
         - shell: |
             #!/bin/bash
             set +e
+            # labconfig is used only for joid
+            labconfig=""
             if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
                 INSTALLER_IP=$(grep instack /var/lib/libvirt/dnsmasq/default.leases \
                     |awk '{print $3}' | head -n 1)
                 sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
+                sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable
+                sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable
+            elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then
+                # If production lab then creds may be retrieved dynamically
+                # creds are on the jumphost, always in the same folder
+                labconfig="-v /home/ubuntu/joid/ci/cloud/admin-openrc:/home/opnfv/functest/conf/openstack.creds"
+                # If dev lab, credentials may not be the default ones, just provide a path to put them into docker
+                # replace the default one by the customized one provided by jenkins config
+                if [ -n "${LAB_CONFIG}" ]; then
+                    labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds"
+                fi
             fi
             echo "Functest: Start Docker and prepare environment"
             envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}"
-            labconfig=""
-            # If production lab then creds may be retrieved dynamically
-            # If dev lab, credentials may not be the default ones, just provide a path to put them into docker
-            if [ -n "${LAB_CONFIG}" ]; then
-                labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds"
-            fi
+
+            dir_result="${HOME}/opnfv/functest/reports"
+            mkdir -f ${dir_result}
+            rm -rf ${dir_result}/*
+            $res_volume="-v ${dir_result}:/home/opnfv/functest/results"
 
             docker pull opnfv/functest:latest_stable
-            cmd="docker run -id -e $envs ${labconfig} ${sshkey} opnfv/functest:latest_stable /bin/bash"
+            cmd="docker run -id -e $envs ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest_stable /bin/bash"
             echo "Functest: Running docker run command: ${cmd}"
             ${cmd}
             docker ps -a