Merge "Switch global-jjb jobs to use mvn35"

[releng/builder.git] / jjb / integration / integration-deploy-openstack-run-test.sh

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 6fa072b14887597500e75d6b3f4e9db129dd8389..06ebf1094f220867e025d8cb4c8878ded6f83e58 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -20,7 +20,9 @@ python ${WORKSPACE}/test/tools/distchanges/changes.py -d /tmp/distribution_folde
 
 printf "\nshowing recent changes that made it into integration/test used by this job:\n"
 cd ${WORKSPACE}/test
-git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s' -n10
+printf "Hash    Author Date                    Commit Date                    Author               Subject"
+printf "------- ------------------------------ ------------------------------ -------------------- -----------------------------"
+git --no-pager log --pretty=format:'%h %<(30)%ad%<(30)%cd %<(20,trunc)%an%d %s' -n20
 cd -
 
 cat << EOF
@@ -1219,12 +1221,14 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do
         exit 1
     fi
 
-    # upgrading pip, urllib3 and httplib2 so that tempest tests can be run on openstack control node
-    # this needs to happen after devstack runs because it seems devstack is pulling in specific versions
-    # of these libs that are not working for tempest.
-    ${SSH} ${!CONTROLIP} "sudo pip install --upgrade pip"
-    ${SSH} ${!CONTROLIP} "sudo pip install urllib3 --upgrade"
-    ${SSH} ${!CONTROLIP} "sudo pip install httplib2 --upgrade"
+    if [ "${OPENSTACK_BRANCH}" == "stable/pike" ]; then
+        # upgrading pip, urllib3 and httplib2 so that tempest tests can be run on openstack control node
+        # this needs to happen after devstack runs because it seems devstack is pulling in specific versions
+        # of these libs that are not working for tempest.
+        ${SSH} ${!CONTROLIP} "sudo pip install --upgrade pip"
+        ${SSH} ${!CONTROLIP} "sudo pip install urllib3 --upgrade"
+        ${SSH} ${!CONTROLIP} "sudo pip install httplib2 --upgrade"
+    fi
 
     # Gather Compute IPs for the site
     for j in `seq 1 ${NUM_COMPUTES_PER_SITE}`; do