Merge lp:~1chb1n/ubuntu-openstack-ci/tox-workdir into lp:ubuntu-openstack-ci

[Ryan Beisner]

Use tox workdir for func tests to prep for Juju 2.5

Use tox workdir for func tests to prep for Juju 2.5

[Liam Young (gnuoy)]

LGTM

review: Approve

=== modified file 'run/job-parts/build_amulet_smoke.sh'
--- run/job-parts/build_amulet_smoke.sh	2018-09-17 15:25:56 +0000
+++ run/job-parts/build_amulet_smoke.sh	2018-09-20 13:37:29 +0000
@@ -21,11 +21,13 @@
 if [[ -n $target ]]; then
   # Look for a func27-smoke tox target and run it as the first preference.
   f_juju_bootstrap
-  timeout 43200 tox -e $target |& tee $WORKSPACE/amulet-smoke.txt ||:
+  tox_workdir="$(mktemp -d)"
+  timeout 43200 tox -e $target --workdir $tox_workdir |& tee $WORKSPACE/amulet-smoke.txt ||:
   if [[ "${PIPESTATUS[0]}" != "0" ]]; then
     echo " ! Amulet smoke failed."
     touch $WORKSPACE/fyi-amulet-smoke.failed
   fi
+  rm -rf $tox_workdir
   f_juju_stat
   f_juju_crashdump
   f_lolo_log_puller

=== modified file 'run/job-parts/build_amulet_test.sh'
--- run/job-parts/build_amulet_test.sh	2018-09-17 15:25:56 +0000
+++ run/job-parts/build_amulet_test.sh	2018-09-20 13:37:29 +0000
@@ -24,11 +24,13 @@
 target=$(awk 'BEGIN {FS=":"} /^\[testenv:(func27|func)\]/ {gsub(/\]/,""); print $2}' tox.ini)
 if [[ -n $target ]]; then
     f_juju_bootstrap
-    timeout 43200 tox -e $target |& tee $WORKSPACE/amulet-full.txt ||:
+    tox_workdir="$(mktemp -d)"
+    timeout 43200 tox -e $target --workdir $tox_workdir |& tee $WORKSPACE/amulet-full.txt ||:
     if [[ "${PIPESTATUS[0]}" != "0" ]]; then
         echo " ! Amulet test failed."
         touch $WORKSPACE/fyi-amulet.failed
     fi
+    rm -rf $tox_workdir
     f_juju_stat
     f_juju_crashdump
     f_lolo_log_puller