Merge lp:~fnordahl/ubuntu-openstack-ci/fix-zaza-integration into lp:ubuntu-openstack-ci

[Frode Nordahl]

This merge proposal addresses two issues:
- Fix a problem with retrieving the commit messages
- Use ``Func-Test-PR`` as header instead of ``Depends-On`` pending resolution of Zuul GitHub integration issues

[Chris MacNaughton (chris.macnaughton)]

Looks reasonable

review: Approve

=== modified file 'run/job-parts/osci_openstack_common.sh'
--- run/job-parts/osci_openstack_common.sh	2018-12-13 20:55:35 +0000
+++ run/job-parts/osci_openstack_common.sh	2019-03-07 14:48:25 +0000
@@ -136,13 +136,13 @@
 }
 
 
-function f_openstack_get_zaza_github_depends_on() {
+function f_openstack_get_zaza_github_func_test_pr() {
     f_line $FUNCNAME
-    _pr=$(git -C ${BUILT_ASSET_DIR-$CO_DIR} show | \
-          awk 'tolower($0) ~ /depends-on: .*github.*zaza.*pull/ {print $2; exit;}' | \
+    _pr=$(git -C ${CO_DIR} show | \
+          awk 'tolower($0) ~ /func-test-pr: .*github.*zaza.*pull/ {print $2; exit;}' | \
           rev | cut -sf1,3,4 -d/ | rev)
     if [ -z "$_pr" ]; then
-      echo "No GitHub Depends-On found..."
+      echo "No GitHub Func-Test-PR found..."
       return
     fi
     _pr_repo=$(echo $_pr | cut -f1-2 -d/)
@@ -158,7 +158,7 @@
 
 function f_openstack_update_zaza_test_requirements() {
     f_line $FUNCNAME
-    f_openstack_get_zaza_github_depends_on
+    f_openstack_get_zaza_github_func_test_pr
     if [ -n "$GITHUB_PR_LOGIN" -a -n "$GITHUB_PR_BRANCH" ]; then
       sed -i s/openstack-charmers\\/zaza.git/${GITHUB_PR_LOGIN}\\/zaza.git@${GITHUB_PR_BRANCH}/ ${BUILT_ASSET_DIR-$CO_DIR}/test-requirements.txt
     fi