Merge "Add joid and apex to yardstick CI"

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 61f5b59..2139079 100644 (file)
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -106,25 +106,35 @@
     builders:
         - shell: |
             #!/bin/bash
-            set -o errexit
+            set +e
+            # labconfig is used only for joid
+            labconfig=""
+            sshkey=""
+            if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
+                instack_mac=$(sudo virsh domiflist instack | grep default | \
+                              grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
+                INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $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 $LAB_CONFIG/admin-openrc:/home/opnfv/openrc"
+                # 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
+            fi
 
-            echo "Yardstick: Run benchmark test suites ..."
+            opts="--privileged=true --rm"
+            envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK} -e YARDSTICK_BRANCH=${GERRIT_BRANCH}"
 
             # Pull the latest image
             docker pull opnfv/yardstick
 
-            docker run \
-               --privileged=true \
-                --rm \
-                -t \
-                -e "INSTALLER_TYPE=${INSTALLER_TYPE}" \
-                -e "INSTALLER_IP=${INSTALLER_IP}" \
-                -e "POD_NAME=${NODE_NAME}" \
-                -e "EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" \
-                -e "YARDSTICK_BRANCH=${GERRIT_BRANCH}" \
-                opnfv/yardstick \
-                run_tests.sh $YARDSTICK_DB_BACKEND \
-                $YARDSTICK_SUITE_NAME
+            # Run docker
+            cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick run_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SUITE_NAME}"
+            echo "Yardstick: Running docker cmd: ${cmd}"
+            ${cmd}
 
             echo "Yardstick: done!"