Merge lp:~chris.macnaughton/ubuntu-openstack-ci/direct-git into lp:ubuntu-openstack-ci

[Chris MacNaughton]

[lp:~chris.macnaughton/ubuntu-openstack-ci/direct-git]

412. By Chris MacNaughton on 2018-12-14

Add optional TEST_PATH to func runner

413. By Chris MacNaughton on 2018-12-14

Replace variable check with a default substitution for GIT_BRANCH

[Liam Young (gnuoy)]

LGTM, thanks

review: Approve

=== modified file 'run/job-parts/build_func_test.sh'
--- run/job-parts/build_func_test.sh	2018-12-13 20:55:35 +0000
+++ run/job-parts/build_func_test.sh	2018-12-14 08:00:44 +0000
@@ -19,6 +19,10 @@
 f_env_set_network_env_vars
 cd ${BUILT_ASSET_DIR-$CO_DIR}
 
+if [[ -n $TEST_PATH ]]; then
+    cd $TEST_PATH
+fi
+
 : ${TOX_SEARCH:="func27|func"}
 target=$(awk "BEGIN {FS=\":\"} /^\[testenv:("$TOX_SEARCH")\]/ {gsub(/\]/,\"\"); print \$2}" tox.ini)
 
 
=== modified file 'run/job-parts/osci_gerrit_common.sh'
--- run/job-parts/osci_gerrit_common.sh	2018-12-13 20:55:35 +0000
+++ run/job-parts/osci_gerrit_common.sh	2018-12-14 08:00:44 +0000
@@ -39,7 +39,9 @@
   fi
 
   # Detect repo approach and fetch/clone/branch the asset
-  if [[ ! -z "$GERRIT_REFSPEC" ]] && [[ "$GERRIT_CHANGE_NUMBER" != "-1" ]]; then
+  if [[ ! -z "$GIT_REPO" ]]; then
+    f_git_checkout_direct
+  elif [[ ! -z "$GERRIT_REFSPEC" ]] && [[ "$GERRIT_CHANGE_NUMBER" != "-1" ]]; then
     f_gerrit_git_fetch_refspec
   elif [[ ! -z "$BASE_NAME" ]] && [[ -z "$BRANCH" ]]; then
     f_git_clone_by_base_name
@@ -52,11 +54,31 @@
 }
 
 
+function f_git_checkout_direct() {
+  # Git clone based on GIT_REPO and optional GIT_BRANCH (default to master)
+  f_line $FUNCNAME
+
+  export GIT_BRANCH=${GIT_BRANCH:-"master"}
+
+  f_set_co_dir
+
+  if [[ -d $CO_DIR ]]; then
+    echo " - Removing existing checkout @ $CO_DIR"
+    rm -rf ${CO_DIR:?}
+  fi
+
+  mkdir -p $CO_DIR
+  echo " + Cloning $GIT_REPO --> $CO_DIR"
+  git clone $GIT_REPO $CO_DIR -b $GIT_BRANCH --depth 1
+  f_git_announce_info
+}
+
+
 function f_git_clone_by_base_name(){
 # Git clone based on BASE_NAME and optional GIT_BRANCH (default to master)
   f_line $FUNCNAME
 
-  [[ -z "$GIT_BRANCH" ]] && export GIT_BRANCH="master"
+  export GIT_BRANCH=${GIT_BRANCH:-"master"}
 
   if [[ -z "$BASE_NAME" ]]; then
     echo " ! Missing the required GIT env vars."