Merge "Use only functest-{testsuite}-builder for the installer daily job builder"

diff --combined jjb/functest/functest-ci-jobs.yml
index 5e1d972,b7a75e8..a0a1326
--- 1/jjb/functest/functest-ci-jobs.yml
--- 2/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@@ -149,8 -149,6 +149,6 @@@
              branch: '{branch}'
  
      builders:
-         - 'functest-cleanup'
-         - 'set-functest-env'
          - 'functest-{testsuite}-builder'
  
  ########################
@@@ -262,12 -260,8 +260,12 @@@
                  fi
                  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
 +                if sudo iptables -C FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable 2> ${redirect}; then
 +                    sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable
 +                fi
 +                if sudo iptables -C FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable 2> ${redirect}; then
 +                    sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable
 +                fi
              elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then
                  # If production lab then creds may be retrieved dynamically
                  # creds are on the jumphost, always in the same folder
@@@ -291,7 -285,7 +289,7 @@@
              cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:${DOCKER_TAG} /bin/bash"
              echo "Functest: Running docker run command: ${cmd}"
              ${cmd} >${redirect}
-             docker ps -a
+             docker ps -a >${redirect}
              sleep 5
              container_id=$(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | awk '{print $1}' | head -1)
              echo "Container ID=${container_id}"
@@@ -303,7 -297,7 +301,7 @@@
              echo "Starting the container: docker start ${container_id}"
              docker start ${container_id}
              sleep 5
-             docker ps
+             docker ps >${redirect}
              if [ $(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | wc -l) == 0 ]; then
                  echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
                  exit 1
@@@ -335,7 -329,7 +333,7 @@@
              # Remove existing images if exist
              if [[ ! -z $(docker images | grep opnfv/functest) ]]; then
                  echo "Docker images to remove:"
-                 docker images | head -1 && docker images | grep opnfv/functest
+                 docker images | head -1 && docker images | grep opnfv/functest >${redirect}
                  image_tags=($(docker images | grep opnfv/functest | awk '{print $2}'))
                  for tag in "${image_tags[@]}"; do
                      echo "Removing docker image opnfv/functest:$tag..."