Merge lp:~gnuoy/ubuntu-openstack-ci/func3 into lp:ubuntu-openstack-ci

[Liam Young]

[James Page (james-page)]

I'd be all for dropping any mention of the python version - its not really important as the charm only runs internally in py27 or py3 - and the tox target itself can define which py version it uses for execution.

So how about func and func-smoke?

[lp:~gnuoy/ubuntu-openstack-ci/func3]

394. By Liam Young <email address hidden> on 2018-04-11

Remove py version for target name for new setups

[Ryan Beisner (1chb1n)]

review: Approve

=== modified file 'run/job-parts/build_amulet_smoke.sh'
--- run/job-parts/build_amulet_smoke.sh	2017-04-26 22:43:21 +0000
+++ run/job-parts/build_amulet_smoke.sh	2018-04-11 14:20:48 +0000
@@ -14,10 +14,11 @@
 f_line "Begin amulet smoke"
 cd ${BUILT_ASSET_DIR-$CO_DIR}
 f_amulet_squash_00setup
-if grep "^\[testenv:func27-smoke\]" tox.ini; then
+target=$(awk 'BEGIN {FS=":"} /^\[testenv:(func27|func)-smoke\]/ {gsub(/\]/,""); print $2}' tox.ini)
+if [[ -n $target ]]; then
   # Look for a func27-smoke tox target and run it as the first preference.
   f_juju_bootstrap
-  tox -e func27-smoke |& tee $WORKSPACE/amulet-smoke.txt ||:
+  tox -e $target |& tee $WORKSPACE/amulet-smoke.txt ||:
   if [[ "${PIPESTATUS[0]}" != "0" ]]; then
     echo " ! Amulet smoke failed."
     touch $WORKSPACE/fyi-amulet-smoke.failed

=== modified file 'run/job-parts/build_amulet_test.sh'
--- run/job-parts/build_amulet_test.sh	2017-04-26 22:43:21 +0000
+++ run/job-parts/build_amulet_test.sh	2018-04-11 14:20:48 +0000
@@ -18,9 +18,10 @@
 f_amulet_set_timeout
 cd ${BUILT_ASSET_DIR-$CO_DIR}
 f_amulet_squash_00setup
-if grep "^\[testenv:func27-smoke\]" tox.ini; then
+target=$(awk 'BEGIN {FS=":"} /^\[testenv:(func27|func)\]/ {gsub(/\]/,""); print $2}' tox.ini)
+if [[ -n $target ]]; then
     f_juju_bootstrap
-    tox -e func27 |& tee $WORKSPACE/amulet-full.txt ||:
+    tox -e $target |& tee $WORKSPACE/amulet-full.txt ||:
     if [[ "${PIPESTATUS[0]}" != "0" ]]; then
         echo " ! Amulet test failed."
         touch $WORKSPACE/fyi-amulet.failed