Support any test-requirements when applying func test pr

Upstream zosci config tries different formats and locations since
the charms are not consistent in how they do this so we mirror that
behaviour here.

openstack/tools/charmed_openstack_functest_runner.sh

@@ -185,12 +185,7 @@ fi
 
 # If a func test pr is provided switch to that pr.
 if [[ -n $FUNC_TEST_PR ]]; then
-    (
-    [[ -d src ]] && cd src
-    # We use the zosci-config tools to do this.
-    MSG=$(echo "Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/$FUNC_TEST_PR"| base64)
-    ~/zosci-config/roles/handle-func-test-pr/files/process_func_test_pr.py -f ./test-requirements.txt "$MSG"
-    )
+    apply_func_test_pr $FUNC_TEST_PR
 fi
 
 declare -A func_target_state=()

openstack/tools/func_test_tools/common.sh

@@ -31,4 +31,16 @@ get_and_update_repo ()
         git clone $url
     fi
     )
+}
+
+apply_func_test_pr ()
+{
+    # Similar to https://github.com/openstack-charmers/zosci-config/blob/master/roles/handle-func-test-pr/tasks/main.yaml#L19
+    local pr_id=$1
+    # We use the zosci-config tools to do this.
+    local msg=$(echo "Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/$pr_id"| base64)
+    ~/zosci-config/roles/handle-func-test-pr/files/process_func_test_pr.py \
+        -f './test-requirements*.txt' \
+        -f './src/test-requirements*.txt' \
+        "$msg"
 }

openstack/tools/openstack_regression_tests_runner.sh

@@ -149,9 +149,7 @@ LOGFILE=$(mktemp --suffix=-openstack-release-test-results)
 
     # If a func test pr is provided switch to that pr.
     if [[ -n $FUNC_TEST_PR ]]; then
-        # We use the zosci-config tools to do this.
-        MSG=$(echo "Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/$FUNC_TEST_PR"| base64)
-        ~/zosci-config/roles/handle-func-test-pr/files/process_func_test_pr.py -f ./test-requirements.txt "$MSG"
+        apply_func_test_pr $FUNC_TEST_PR
     fi
 
     tox -re func-target -- $FUNC_TEST_TARGET || true