From ca6c672aad5f34e2367f8e4fc80ef0899fd73fe1 Mon Sep 17 00:00:00 2001
From: Sam Hague <shague@redhat.com>
Date: Thu, 7 Sep 2017 08:47:39 -0400
Subject: [PATCH] Add option checkout devstack commit

Change-Id: Ie7854a7a0554b3ce117c73d76fb23199ed3f11b8
Signed-off-by: Sam Hague <shague@redhat.com>
---
 .../integration-deploy-openstack-run-test.sh  | 19 ++++++-------------
 jjb/integration/integration-templates.yaml    |  8 ++++++++
 jjb/netvirt/netvirt-csit-multi-openstack.yaml |  3 +++
 jjb/releng-defaults.yaml                      |  1 +
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 294e3f6ff..1ea2fcac1 100644
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -554,19 +554,12 @@ sudo mkdir /opt/stack
 sudo chmod 777 /opt/stack
 cd /opt/stack
 git clone https://git.openstack.org/openstack-dev/devstack --branch $OPENSTACK_BRANCH
-EOF
-
-#Work around for pike stacking failure by avoiding recently merged changes
-# Currently reset to state as in 01-Sep-2017
-#ToDo Need to get rid of this sooner
-if [ "${OPENSTACK_BRANCH}" == "stable/pike" ]; then # Pike
-cat >> ${WORKSPACE}/get_devstack.sh << EOF
 cd devstack
-git reset --hard c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65
-EOF
+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
 sudo nova-manage cell_v2 map_cell0
@@ -618,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 &"
@@ -642,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 &"
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 15aad57ec..cdf9d9af9 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1025,6 +1025,10 @@
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
           description: 'Openstack version to use with devstack'
+      - string:
+          name: DEVSTACK_HASH
+          default: '{devstack-hash}'
+          description: 'devstack hash to checkout'
       - string:
           name: ODL_ML2_DRIVER_REPO
           default: '{odl-ml2-driver-repo}'
@@ -1214,6 +1218,10 @@
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
           description: 'Openstack version to use with devstack'
+      - string:
+          name: DEVSTACK_HASH
+          default: '{devstack-hash}'
+          description: 'devstack hash to checkout'
       - string:
           name: ODL_ML2_DRIVER_REPO
           default: '{odl-ml2-driver-repo}'
diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 81af49d92..20e3c767c 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -48,6 +48,7 @@
     openstack:
       - pike:
           openstack-branch: 'stable/pike'
+          devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-driver-version: 'v2'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
@@ -115,6 +116,7 @@
     openstack:
       - pike:
           openstack-branch: 'stable/pike'
+          devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-driver-version: 'v2'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
@@ -181,6 +183,7 @@
           openstack_system2_image: 'CentOS 7 - devstack-newton - 20170707-0359'
       - pike:
           openstack-branch: 'stable/pike'
+          devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-driver-version: 'v2'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index eb2e88d2f..2d6681e74 100644
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -27,6 +27,7 @@
     lftools-version: <1.0.0
 
     # defaults for parameters installing openstack for csit jobs
+    devstack-hash: ''
     create-initial-networks: 'False'
     disable-odl-l3-service-plugin: 'no'
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
-- 
2.36.6