Merge lp:~1chb1n/ubuntu-openstack-ci/charm-what-bundle-func into lp:ubuntu-openstack-ci

[Ryan Beisner]

Update asset type checking for zaza func bundle style

Update asset type checking for zaza func bundle style

[lp:~1chb1n/ubuntu-openstack-ci/charm-what-bundle-func]

413. By Ryan Beisner on 2018-12-17

Require BASE_NAME when setting CO_DIR

414. By Ryan Beisner on 2018-12-17

Rebase this branch with trunk

415. By Ryan Beisner on 2018-12-17

Update asset type check for zaza bundle approach

416. By Ryan Beisner on 2018-12-17

Debug CO_DIR TEST_PATH BUILT_ASSET DIR env vars

417. By Ryan Beisner on 2018-12-17

Add osci repo info to console output for clarity

418. By Ryan Beisner on 2018-12-17

Clean up

419. By Ryan Beisner on 2018-12-17

Update known asset type filter

420. By Ryan Beisner on 2018-12-17

Additional update to type filter

421. By Ryan Beisner on 2018-12-17

Clean up

[Chris MacNaughton (chris.macnaughton)]

LGTM

review: Approve

=== modified file 'run/job-parts/build_func_test.sh'
--- run/job-parts/build_func_test.sh	2018-12-14 07:57:29 +0000
+++ run/job-parts/build_func_test.sh	2018-12-17 18:33:29 +0000
@@ -17,10 +17,12 @@
 
 f_line "Begin functional test"
 f_env_set_network_env_vars
-cd ${BUILT_ASSET_DIR-$CO_DIR}
 
-if [[ -n $TEST_PATH ]]; then
-    cd $TEST_PATH
+if [[ -n "$CO_DIR" ]] && [[ -n "$TEST_PATH" ]]; then
+    # openstack-bundles style zaza test
+    cd ${CO_DIR}/${TEST_PATH}
+else
+    cd ${BUILT_ASSET_DIR-$CO_DIR}
 fi
 
 : ${TOX_SEARCH:="func27|func"}

=== modified file 'run/job-parts/osci_job_common.sh'
--- run/job-parts/osci_job_common.sh	2018-12-13 20:55:35 +0000
+++ run/job-parts/osci_job_common.sh	2018-12-17 18:33:29 +0000
@@ -275,6 +275,12 @@
 function f_set_co_dir() {
 # Set the checkout dir
   mkdir -p $JENKINS_HOME/checkout/$EXECUTOR_NUMBER
+
+  if [[ -z "$BASE_NAME" ]]; then
+    echo " ! Missing BASE_NAME, cannot set CO_DIR"
+    exit 1
+  fi
+
   export CO_DIR=$JENKINS_HOME/checkout/$EXECUTOR_NUMBER/$BASE_NAME
 }
 
@@ -491,6 +497,8 @@
   export SKIP_JUJU_FOO="true"
 }
 
+f_line "OSCI_ROOT repo info"
+bzr info ${OSCI_ROOT}
 
 # Charm store timeout value, consumed by libcharmstore
 export CS_API_TIMEOUT=60

=== modified file 'run/job-parts/osci_layerci_common.sh'
--- run/job-parts/osci_layerci_common.sh	2018-08-09 12:13:38 +0000
+++ run/job-parts/osci_layerci_common.sh	2018-12-17 18:33:29 +0000
@@ -213,6 +213,10 @@
         # Change nothing at this time
         echo " . Proceeding with $CO_DIR as an interface [no build necessary]"
         ;;
+    "bundle (func)")
+        # A zaza-testable bundle, ie. from openstack-bundle
+        echo " . Proceeding with $CO_DIR as a testable bundle"
+        ;;
     *)
         echo " ! Unknown asset type"
         exit 1
@@ -229,7 +233,7 @@
 
   f_layerci_check_and_announce_asset_type
   case "$OSCI_ASSET_TYPE" in
-    "charm (built)"|"charm (classic)")
+    "charm (built)"|"charm (classic)"|"bundle (func)")
         # OK
         :
         ;;
@@ -250,7 +254,7 @@
 function f_layerci_build_if_necessary() {
     f_layerci_check_and_announce_asset_type
     case "$OSCI_ASSET_TYPE" in
-        "charm (built)"|"charm (classic)")
+        "charm (built)"|"charm (classic)"|"bundle (func)")
             # OK
             :
             ;;
@@ -268,9 +272,15 @@
 
 function f_layerci_check_and_announce_asset_type() {
 # Check (or re-check) and announce asset type via charm-what.
-  f_layerci_get_asset_type ${BUILT_ASSET_DIR-$CO_DIR}
+
+  if [[ -n "$CO_DIR" ]] && [[ -n "$TEST_PATH" ]]; then
+    f_layerci_get_asset_type ${CO_DIR}/${TEST_PATH}
+  else
+    f_layerci_get_asset_type ${BUILT_ASSET_DIR-$CO_DIR}
+  fi
+
   case "$OSCI_ASSET_TYPE" in
-    "charm (built)"|"charm (classic)"|"charm (source)"|"layer"|"interface")
+    "charm (built)"|"charm (classic)"|"charm (source)"|"layer"|"interface"|"bundle (func)")
         # OK
         :
         ;;