X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-deploy-openstack-run-test.sh;h=aa8a735ec621bf179b97d8d60b21ab66219caf06;hb=3e1838bb1e69a32cac75b80890e8c914e2a202ae;hp=b634c6e052c5dd50028bf86149aabed10660b6e9;hpb=7248e7b7a404d957802d8f8cb8cf0d020dd5b661;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index b634c6e05..aa8a735ec 100644
--- 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
@@ -986,18 +988,8 @@ if [ -n "${DEVSTACK_HASH}" ]; then
     echo "git checkout ${DEVSTACK_HASH}"
     git checkout ${DEVSTACK_HASH}
 fi
-echo "workaround: Restore NEUTRON_CREATE_INITIAL_NETWORKS flag"
-if [ "${OPENSTACK_BRANCH}" == "stable/queens" ]; then
-    git config --local user.email jenkins@opendaylight.org
-    git config --local user.name jenkins
-    git fetch https://git.openstack.org/openstack-dev/devstack refs/changes/99/550499/1 && git cherry-pick FETCH_HEAD
-fi
 git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s%b' -n20
 echo
-echo "workaround: adjust wait from 60s to 1800s (30m)"
-sed -i 's/wait_for_compute 60/wait_for_compute 1800/g' /opt/stack/devstack/lib/nova
-# TODO: modify sleep 1 to sleep 60, search wait_for_compute, then first sleep 1
-# that would just reduce the number of logs in the compute stack.log
 
 echo "workaround: do not upgrade openvswitch"
 sudo yum install -y yum-plugin-versionlock
@@ -1219,15 +1211,6 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do
         exit 1
     fi
 
-    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
         COMPUTE_INDEX=$(((i-1) * NUM_COMPUTES_PER_SITE + j))