Add option checkout devstack commit

[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 eb21b8567443a1f51a1c7c9d17e92785691fd20b..1ea2fcac178a4e1ada5822ae0f091b18b1c3c8bf 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -217,6 +217,10 @@ minimize_polling=True
 physical_network_mtus = ${PUBLIC_PHYSICAL_NETWORK}:1440
 path_mtu = 1490
 
+# workaround for port-status not working due to https://bugs.opendaylight.org/show_bug.cgi?id=9092
+[ml2_odl]
+odl_features=nothing
+
 [[post-config|/etc/neutron/dhcp_agent.ini]]
 [DEFAULT]
 force_metadata = True
@@ -323,17 +327,6 @@ auth_strategy = keystone
 use_neutron = True
 EOF
 
-# Keep this block after the nova.conf above to ensure it goes in the DEFAULT section
-# Ignore not receiving the vif plugging event by setting the vif_plugging_is_fatal ot false.
-# Due to https://bugs.opendaylight.org/show_bug.cgi?id=9092, the event is not sent.
-# This allows the instance to spawn and neutron and nove to continue processing the vm creation.
-if [ "${OPENSTACK_BRANCH}" == "stable/pike" ]; then
-cat >> ${local_conf_file_name} << EOF
-vif_plugging_timeout = 300
-vif_plugging_is_fatal = false
-EOF
-fi
-
 echo "Compute local.conf created:"
 cat ${local_conf_file_name}
 }
@@ -561,8 +554,11 @@ sudo mkdir /opt/stack
 sudo chmod 777 /opt/stack
 cd /opt/stack
 git clone https://git.openstack.org/openstack-dev/devstack --branch $OPENSTACK_BRANCH
-#To fix the recent tempest/tox issues which blocks stacking
-sudo pip install tox==2.7.0
+cd devstack
+if [ -n "${DEVSTACK_HASH}" ]; then
+    git checkout ${DEVSTACK_HASH}
+fi
+git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s\n%b' -n20
 EOF
 
 cat > "${WORKSPACE}/setup_host_cell_mapping.sh" << EOF
@@ -615,7 +611,7 @@ do
     create_etc_hosts ${!CONTROLIP}
     scp ${WORKSPACE}/hosts_file ${!CONTROLIP}:/tmp/hosts
     scp ${WORKSPACE}/get_devstack.sh ${!CONTROLIP}:/tmp
-    ${SSH} ${!CONTROLIP} "bash /tmp/get_devstack.sh"
+    ${SSH} ${!CONTROLIP} "bash /tmp/get_devstack.sh > /tmp/get_devstack.sh.txt 2>&1"
     create_control_node_local_conf ${!CONTROLIP} ${ODLMGRIP[$i]} "${ODL_OVS_MGRS[$i]}"
     scp ${WORKSPACE}/local.conf_control_${!CONTROLIP} ${!CONTROLIP}:/opt/stack/devstack/local.conf
     ssh ${!CONTROLIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
@@ -639,7 +635,7 @@ do
     create_etc_hosts ${!COMPUTEIP} ${!CONTROLIP}
     scp ${WORKSPACE}/hosts_file ${!COMPUTEIP}:/tmp/hosts
     scp ${WORKSPACE}/get_devstack.sh  ${!COMPUTEIP}:/tmp
-    ${SSH} ${!COMPUTEIP} "bash /tmp/get_devstack.sh"
+    ${SSH} ${!COMPUTEIP} "bash /tmp/get_devstack.sh > /tmp/get_devstack.sh.txt 2>&1"
     create_compute_node_local_conf ${!COMPUTEIP} ${!CONTROLIP} ${ODLMGRIP[$SITE_INDEX]} "${ODL_OVS_MGRS[$SITE_INDEX]}"
     scp ${WORKSPACE}/local.conf_compute_${!COMPUTEIP} ${!COMPUTEIP}:/opt/stack/devstack/local.conf
     ssh ${!COMPUTEIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"