Merge lp:~1chb1n/ubuntu-openstack-ci/artifact-move into lp:ubuntu-openstack-ci

[Ryan Beisner]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2569 lp:ubuntu-openstack-ci for 1chb1n mp294675
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/2569/

[lp:~1chb1n/ubuntu-openstack-ci/artifact-move]

346. By Ryan Beisner on 2016-05-14

Update amulet smoke runner

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2579 lp:ubuntu-openstack-ci for 1chb1n mp294675
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/2579/

[lp:~1chb1n/ubuntu-openstack-ci/artifact-move]

347. By Ryan Beisner on 2016-05-16

Disable juju ppa switching; arrange all apt operations centrally.

348. By Ryan Beisner on 2016-05-16

Update maint_node

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2598 lp:ubuntu-openstack-ci for 1chb1n mp294675
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/2598/

[lp:~1chb1n/ubuntu-openstack-ci/artifact-move]

349. By Ryan Beisner on 2016-05-18

Temporarily set juju root trace level logging

350. By Ryan Beisner on 2016-05-18

Undo trace log

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2619 lp:ubuntu-openstack-ci for 1chb1n mp294675
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/2619/

=== modified file '.bzrignore'
--- .bzrignore	2015-02-18 04:49:11 +0000
+++ .bzrignore	2016-05-18 11:59:22 +0000
@@ -15,3 +15,4 @@
 deployment/jobs/jobs-static-initial.tgz
 temp.py
 .coverage
+deployment/deploy-files/novarc-artifactcloud
 
=== added file 'admin/822-novarc-artifactweb-credentials-distribute.sh'
--- admin/822-novarc-artifactweb-credentials-distribute.sh	1970-01-01 00:00:00 +0000
+++ admin/822-novarc-artifactweb-credentials-distribute.sh	2016-05-18 11:59:22 +0000
@@ -0,0 +1,29 @@
+#!/bin/bash -e
+echo $0
+
+# Copy artifactcloud credentials file to all nodes
+# Requires that you have placed credentials in the deploy-files dir
+
+. $(dirname $0)/../env-common
+
+f_name="novarc-artifactcloud"
+f_dst_dir="${JENKINS_HOME}"
+f_dst="${f_dst_dir}/${f_name}"
+f_tmp="${U_HOME}/${f_name}"
+f_src_dir="../deployment/deploy-files"
+f_src="${f_src_dir}/${f_name}"
+
+if [ ! -f "$f_src" ]; then
+  echo "Local source file ${f_src} not found."
+  pwd
+  exit 1
+fi
+
+for unit in $UNITS; do
+  echo "copying ${f_src} into ${unit}"
+  juju scp $f_src ${unit}:${f_tmp}
+  echo "adjusting permissions"
+  juju ssh $unit "sudo mv $f_tmp $f_dst &&\
+    sudo chown jenkins:jenkins ${f_dst} &&\
+    sudo chmod 600 ${f_dst}"
+done
 
=== modified file 'job-parts/build_amulet_smoke.sh'
--- job-parts/build_amulet_smoke.sh	2016-04-05 17:47:28 +0000
+++ job-parts/build_amulet_smoke.sh	2016-05-18 11:59:22 +0000
@@ -4,69 +4,27 @@
 # Source the common functions
 . ${OSCI_ROOT}/job-parts/osci_job_common.sh
 
-PREFER_CURRENT_LTS="trusty"
-BLACKLIST_CURRENT_OS_DEV="mitaka"
-
 f_fresh_clean_start
 f_check_out_universal
+f_amulet_squash_00setup
+f_amulet_set_network_env_vars
+f_env_no_pass
 
 f_line "Begin amulet smoke"
 cd $CO_DIR
-export AMULET_TESTS_ALL="$(find ./tests -maxdepth 1 -type f -executable -print | sort)"
-
-# Select Preferred Test: latest trusty test combo which is enabled and executable
-#   Exclude *git* (deploy-from-source) amulet test definitions.
-export AMULET_TEST_NAME="$(echo "$AMULET_TESTS_ALL" | grep $PREFER_CURRENT_LTS | grep -v git | grep -v $BLACKLIST_CURRENT_OS_DEV | tail -n 1)"
-
-# Select Alternate Test: first in lexical order which is enabled and executable
-#   Exclude *git* (deploy-from-source) amulet test definitions.
-if [[ -z "$AMULET_TEST_NAME" ]]; then
-  export AMULET_TEST_NAME="$(echo "$AMULET_TESTS_ALL" | grep -v git | grep -v $BLACKLIST_CURRENT_OS_DEV | head -n 1)"
-fi
-
-# Still no test found based on preference or blacklist, just run with one.
-#   Exclude *git* (deploy-from-source) amulet test definitions.
-if [[ -z "$AMULET_TEST_NAME" ]]; then
-  export AMULET_TEST_NAME="$(echo "$AMULET_TESTS_ALL" | grep -v git | head -n 1)"
-fi
-
-# Look for 00-setup (amulet dependencies installer) and exec if found
-AMULET_SETUP="$(find ./tests -type f -executable -name 00-setup -print | head -n 1)"
-if [[ ! -z "$AMULET_SETUP" ]]; then
-  echo " . Executing amulet setup: $AMULET_SETUP"
-  $AMULET_SETUP
+if grep "\[testenv:func27-smoke\]" tox.ini; then
+  # Look for a func27-smoke tox target and run it as the first preference.
+  tox -e func27-smoke
 else
-  echo " ! Unable to find amulet 00-setup file. Proceeding anyway."
-fi
-
-f_amulet_set_network_env_vars
-f_env_no_pass
-
-if [[ -z "$AMULET_TEST_NAME" ]]; then
-  echo " ! Unable to determine which amulet test to run from $CO_DIR/tests"
-  ls -al $CO_DIR/tests
-  exit 1
-fi
-
-echo " . Available amulet tests:"
-echo "$AMULET_TESTS_ALL"
-echo " . Automatically selected test:  $AMULET_TEST_NAME"
-
-f_juju_bootstrap
-
-cd $CO_DIR
-$AMULET_TEST_NAME |& tee $WORKSPACE/amulet-smoke.txt || true
-if [[ "${PIPESTATUS[0]}" != "0" ]]; then
-  echo " ! Amulet smoke test failed: $AMULET_TEST_NAME."
-  touch $WORKSPACE/fyi-amulet-smoke.failed
-fi
-
-f_line "Cleaning up deployer temp directories"
-echo " - Removing dir: $CO_DIR"
-cd $WORKSPACE
-rm -rf $CO_DIR
+  # No func27-smoke tox target exists, run a naked amulet test as smoke.
+  echo " ! Tox-based amulet smoke target not found, falling back to automatic test selection."
+  f_amulet_smoke_select_tests_fallback
+  f_juju_bootstrap
+  f_amulet_naked_test_run
+fi
 f_line "End amulet smoke"
 
+f_remove_co_dir
 f_collect_juju_logs
 f_set_build_descr
 f_nice_finish
 
=== modified file 'job-parts/build_amulet_test.sh'
--- job-parts/build_amulet_test.sh	2016-02-29 19:46:17 +0000
+++ job-parts/build_amulet_test.sh	2016-05-18 11:59:22 +0000
@@ -5,7 +5,7 @@
 # Makefile command search strings, first match wins
 sstring[0]="@juju test"
 sstring[1]=".venv/bin/bundletester"
-#sstring[2]=""
+sstring[2]="@tox -e func27"
 #sstring[3]=""
 #sstring[4]=""
 
@@ -28,6 +28,7 @@
 f_line "begin amulet test"
 f_juju_get_pkg_info juju-pkg-info.txt
 f_run_makefile_test
+f_get_func_results_file
 f_line "end amulet test"
 
 f_collect_juju_logs
 
=== modified file 'job-parts/build_bucket_junk_cleanup.sh'
--- job-parts/build_bucket_junk_cleanup.sh	2016-04-15 03:53:13 +0000
+++ job-parts/build_bucket_junk_cleanup.sh	2016-05-18 11:59:22 +0000
@@ -4,7 +4,7 @@
 
 f_gerrit_set_blob_vars
 env | egrep "BUILD|JOB_|GERRIT|UOSCI|HUDSON|JENKINS|WORKSPACE" | sort
-f_novarc_undercloud
+f_novarc_artifactcloud
 
 
 f_line "Deleting junk objects"
 
=== modified file 'job-parts/build_bucket_reset_object_headers.sh'
--- job-parts/build_bucket_reset_object_headers.sh	2016-04-15 03:53:13 +0000
+++ job-parts/build_bucket_reset_object_headers.sh	2016-05-18 11:59:22 +0000
@@ -4,7 +4,7 @@
 
 f_gerrit_set_blob_vars
 env | egrep "BUILD|JOB_|GERRIT|UOSCI|HUDSON|JENKINS|WORKSPACE" | sort
-f_novarc_undercloud
+f_novarc_artifactcloud
 
 f_bucket_reset_txt_html_object_headers
 
 
=== modified file 'job-parts/build_bucket_update_indices.sh'
--- job-parts/build_bucket_update_indices.sh	2016-04-15 03:53:13 +0000
+++ job-parts/build_bucket_update_indices.sh	2016-05-18 11:59:22 +0000
@@ -4,7 +4,7 @@
 
 f_gerrit_set_blob_vars
 env | egrep "BUILD|JOB_|GERRIT|UOSCI|HUDSON|JENKINS|WORKSPACE" | sort
-f_novarc_undercloud
+f_novarc_artifactcloud
 
 f_bucket_create_index_of_indices
 f_bucket_upload_index_of_indices
 
=== modified file 'job-parts/build_charm_single.sh'
--- job-parts/build_charm_single.sh	2016-04-22 16:23:41 +0000
+++ job-parts/build_charm_single.sh	2016-05-18 11:59:22 +0000
@@ -12,10 +12,10 @@
 # Gerrit-triggered jobs will pass GERRIT_BRANCH, while other legacy
 # jobs will pass GIT_BRANCH.
 if [[ -z "$SUPPORTED_SERIES" ]] && [[ "$GERRIT_BRANCH" != *stable* ]] && [[ "$GIT_BRANCH" != *stable* ]]; then
-  # Master
+  # Master (dev)
   export SUPPORTED_SERIES="trusty wily xenial"
 elif [[ -z "$SUPPORTED_SERIES" ]] && [[ "$GERRIT_BRANCH" != "master" ]] && [[ "$GIT_BRANCH" != "master" ]]; then
-  # Stable
+  # Stable (released)
   export SUPPORTED_SERIES="trusty wily xenial"
 else
   echo " ! Unable to determine SUPPORTED_SERIES based on GERRIT_BRANCH and/or GIT_BRANCH values"
 
=== added file 'job-parts/build_maint_nodes.sh'
--- job-parts/build_maint_nodes.sh	1970-01-01 00:00:00 +0000
+++ job-parts/build_maint_nodes.sh	2016-05-18 11:59:22 +0000
@@ -0,0 +1,27 @@
+#!/bin/bash -e
+#  Build script to perform periodic jenkins master/slave maintenance tasks
+
+# Source the common functions
+. ${OSCI_ROOT}/job-parts/osci_job_common.sh
+
+# Prep environment
+f_skip_juju_lxc
+f_fresh_clean_start
+f_env_no_pass
+
+# Install/update to the latest version of mojo
+f_mojo_install
+
+# Install/update to the latest version of openstack-installer
+f_osi_install
+
+# Install/update to the latest version of git and bzr tools
+f_vcs_tools_install
+
+# Install update misc tools
+f_misc_global_tools_install
+
+# Wrap up
+f_set_build_descr
+f_nice_finish
+f_check_fail
 
=== modified file 'job-parts/build_mojo_runner.sh'
--- job-parts/build_mojo_runner.sh	2016-02-29 21:54:46 +0000
+++ job-parts/build_mojo_runner.sh	2016-05-18 11:59:22 +0000
@@ -32,7 +32,6 @@
 # Prep environment
 f_fresh_clean_start
 f_env_no_pass
-f_mojo_install
 
 f_line "validating mojo runner env vars"
 f_mojo_handle_env_vars
 
=== modified file 'job-parts/build_osi.sh'
--- job-parts/build_osi.sh	2015-11-21 14:39:51 +0000
+++ job-parts/build_osi.sh	2016-05-18 11:59:22 +0000
@@ -38,7 +38,6 @@
 f_env_no_pass
 f_touch_try
 f_amulet_set_network_env_vars
-f_osi_install
 
 # Go!
 f_line "Deploy via OSI (openstack-installer mode: ${OSI_MODE})"
 
=== renamed file 'job-parts/osci_vcs_common.sh' => 'job-parts/osci_apt_common.sh'
--- job-parts/osci_vcs_common.sh	2016-02-24 19:45:46 +0000
+++ job-parts/osci_apt_common.sh	2016-05-18 11:59:22 +0000
@@ -2,13 +2,66 @@
 #
 #  Common functions for UOSCI vcs systems (publicly-available information only!)
 
+
 function f_vcs_configure() {
-  dpkg-query --show bzr || sudo apt-get install bzr -y
-  dpkg-query --show git || sudo apt-get install git -y
-  dpkg-query --show git-review || sudo apt-get install git-review -y
+f_line "vcs configure"
   bzr whoami "uoscibot <[e-mail]>"
   bzr launchpad-login uosci-testing-bot
   git config --global user.email "[e-mail]"
   git config --global user.name "uoscibot"
   git config --global gitreview.username "uosci-testing-bot"
 }
+
+
+function f_vcs_tools_install() {
+# VCS packages to keep installed and updated on all master/slaves
+f_line "vcs tools install"
+  sudo apt-get update -y &> /dev/null || true
+  sudo apt-get install bzr -y
+  sudo apt-get install git -y
+  sudo apt-get install git-review -y
+}
+
+
+function f_misc_global_tools_install() {
+# Misc packages to keep installed and updated on all master/slaves
+f_line "misc global tools install"
+  sudo apt-get update -y &> /dev/null || true
+  sudo apt-get install ipcalc -y
+  sudo apt-get install bzr-fastimport -y
+  sudo apt-get install python-virtualenv libffi-dev libssl-dev -y
+}
+
+
+function f_mojo_install() {
+# Install or upgrade mojo
+f_line "mojo install"
+  echo "Installing or upgrading mojo..."
+  sudo add-apt-repository ppa:mojo-maintainers/ppa -y &> /dev/null || true
+  sudo apt-get update -y &> /dev/null || true
+  sudo apt-get install mojo -y || true
+  if [ -z "$(apt-cache policy mojo | grep 'Installed:')" ]; then
+    echo " ! Mojo install failed."
+    exit 1
+  fi
+  echo "Mojo version:"
+  mojo --version
+  dpkg-query --list mojo
+}
+
+
+function f_osi_install() {
+# Install or upgrade openstack-installer
+f_line "osi install"
+  echo " + Installing or upgrading openstack-installer..."
+  sudo add-apt-repository ppa:cloud-installer/experimental -y &> /dev/null || true
+  sudo apt-get update -y &> /dev/null || true
+  sudo apt-get install openstack -y || true
+  sudo apt-get install python3-pytest -y
+  if [ -z "$(apt-cache policy openstack | grep 'Installed:')" ]; then
+    echo " ! openstack-installer install failed."
+    exit 1
+  fi
+  echo " . openstack-install version:"
+  openstack-install --version
+}
 
=== modified file 'job-parts/osci_gerrit_common.sh'
--- job-parts/osci_gerrit_common.sh	2016-04-15 14:13:15 +0000
+++ job-parts/osci_gerrit_common.sh	2016-05-18 11:59:22 +0000
@@ -151,7 +151,7 @@
 
 function f_gerrit_set_blob_vars(){
   export UOSCI_BUCKET_NAME="uosci-artifacts"
-  export UOSCI_BLOB_STORE="http://10.245.161.162/swift/v1/${UOSCI_BUCKET_NAME}"  # no trailing slash!
+  export UOSCI_BLOB_STORE="https://openstack-ci-reports.ubuntu.com/artifacts"  # no trailing slash!
 
   if [[ ! -z "$GERRIT_CHANGE_NUMBER" ]]; then
     # GERRIT CHANGE TRIGGER
@@ -173,7 +173,7 @@
 
   f_gerrit_create_artifact_index
   echo "Uploading..."
-  f_novarc_undercloud
+  f_novarc_artifactcloud
   swift upload $UOSCI_BUCKET_NAME --object-name $UOSCI_BLOB_PATH ${WORKSPACE}
 
   # Set content-type for txt and html files
@@ -182,7 +182,6 @@
 
   # Temp Debug
   echo "UOSCI_BLOB_URL:  ${UOSCI_BLOB_URL}"
-  echo "Temp/private bucket:  http://10.245.161.162/swift/v1/${UOSCI_BUCKET_NAME}/${UOSCI_BLOB_PATH}/index.html"
 }
 
 
@@ -195,10 +194,6 @@
   swift post -H "content-type:text/html" $UOSCI_BUCKET_NAME index.html
   swift stat $UOSCI_BUCKET_NAME index.html
   set +x
-
-  # Temp debug
-  echo "Temp/private bucket:  http://10.245.161.162/swift/v1/${UOSCI_BUCKET_NAME}/index.html"
-  curl -IL http://10.245.161.162/swift/v1/${UOSCI_BUCKET_NAME}/index.html
 }
 
 
@@ -214,8 +209,7 @@
 
   export _MSG_START="Build ${UOSCI_GERRIT_VERDICT} by Canonical OpenStack Charm CI."
 
-  export _MSG_MORE_INFO="- Note: We are working to expose artifact links publicly.
-- Canonical OpenStack Charm CI Third Party Wiki: ${UOSCI_WIKI_LINK}
+  export _MSG_MORE_INFO="- Canonical OpenStack Charm CI Third Party Wiki: ${UOSCI_WIKI_LINK}
 - OpenStack Charmers Mailing List: ${UOSCI_ML_LINK}
 - Developing OpenStack Charms: ${UOSCI_COMMUNITY_README_LINK}"
 
@@ -304,7 +298,7 @@
       add_line "  <table>"
 
   # Get index string from key 4, reverse sort by key 2 (date)
-  INDICES=$(swift list uosci-artifacts -l | grep -e 'index.html$' | grep -v '^index.html' | sort -rk 2 | awk '{ print $4 }')
+  INDICES=$(swift list uosci-artifacts -l | grep -e 'index.html$' | grep -v ' index.html' | sort -rk 2 | awk '{ print $4 }')
 
   for i in $INDICES; do
     # link="<a href=\"${i}\">VIEW</a>"
 
=== modified file 'job-parts/osci_job_common.sh'
--- job-parts/osci_job_common.sh	2016-04-08 14:28:16 +0000
+++ job-parts/osci_job_common.sh	2016-05-18 11:59:22 +0000
@@ -10,7 +10,7 @@
 . ${OSCI_ROOT}/job-parts/osci_jujudevel_common.sh
 . ${OSCI_ROOT}/job-parts/osci_mojo_common.sh
 . ${OSCI_ROOT}/job-parts/osci_osi_common.sh
-. ${OSCI_ROOT}/job-parts/osci_vcs_common.sh
+. ${OSCI_ROOT}/job-parts/osci_apt_common.sh
 . ${OSCI_ROOT}/job-parts/osci_gerrit_common.sh
 
 
@@ -262,6 +262,12 @@
 }
 
 
+function f_get_func_results_file() {
+# Copy functional test results file if it exists
+  cp -fv $CO_DIR/func-results.json $WORKSPACE/func-results.json.txt 2>/dev/null ||:
+}
+
+
 function f_check_out_lp_branch() {
 # check out branch
   if [[ -z "$BASE_NAME" ]] || [[ -z "$BRANCH" ]]; then
@@ -555,6 +561,15 @@
 }
 
 
+function f_remove_co_dir() {
+# Remove asset checkout directory from workspace
+  f_line "Cleaning up deployer temp directories"
+  echo " - Removing dir: $CO_DIR"
+  cd $WORKSPACE
+  rm -rf $CO_DIR
+}
+
+
 function f_line() {
   echo "====>  ${1}  <======================="
 }
 
=== modified file 'job-parts/osci_jujudevel_common.sh'
--- job-parts/osci_jujudevel_common.sh	2016-03-04 06:14:35 +0000
+++ job-parts/osci_jujudevel_common.sh	2016-05-18 11:59:22 +0000
@@ -2,6 +2,11 @@
 #
 #  Common functions for UOSCI jobs, specific to exercising the
 #  development version of juju.
+#
+#  /!\ This is pre-juju2 legacy wares for installing, detecting and switching
+#      juju environment names based on ppa value.  This will not work well
+#      when juju1 and juju2 exist in the same ppas or in the same distro mains.
+#      Refactor and deprecation underway.
 
 export JUJU_STABLE="ppa:juju/stable"
 export JUJU_PROPOSED="ppa:juju/proposed"
@@ -84,10 +89,15 @@
       ;;
   esac
 
-  echo " + Adding juju ppa ${JUJU_SOURCE} and updating packages."
-  sudo add-apt-repository $JUJU_SOURCE -y
-  sudo apt-get update -y 2>&1 > /dev/null
-  sudo apt-get install juju juju-core juju-deployer amulet charm-tools -y
+  echo " ! DEPRECATED - NOT Adding or switching juju ppa ${JUJU_SOURCE} and updating packages."
+  echo " ! Jenkins builds no longer install/upgrade/downgrade juju binaries."
+# With the advent of juju2 and potential mixing of juju1 + juju2 in ppas, jobs are
+# no longer installing juju.  All legacy slaves should remain at juju 1.x, and will
+# need to be maintained/upgraded outside of the job (ie. juju run) out of band.
+#  echo " + Adding juju ppa ${JUJU_SOURCE} and updating packages."
+#  sudo add-apt-repository $JUJU_SOURCE -y
+#  sudo apt-get update -y 2>&1 > /dev/null
+#  sudo apt-get install juju juju-core juju-deployer amulet charm-tools -y
   f_juju_version_announce
   f_juju_enviro_switcher
 
 
=== modified file 'job-parts/osci_mojo_common.sh'
--- job-parts/osci_mojo_common.sh	2016-04-21 17:42:40 +0000
+++ job-parts/osci_mojo_common.sh	2016-05-18 11:59:22 +0000
@@ -10,22 +10,6 @@
 }
 
 
-function f_mojo_install() {
-# Install or upgrade mojo
-  echo "Installing or upgrading mojo..."
-  sudo add-apt-repository ppa:mojo-maintainers/ppa -y &> /dev/null || true
-  sudo apt-get update -y &> /dev/null || true
-  sudo apt-get install mojo -y || true
-  if [ -z "$(apt-cache policy mojo | grep 'Installed:')" ]; then
-    echo " ! Mojo install failed."
-    exit 1
-  fi
-  echo "Mojo version:"
-  mojo --version
-  dpkg-query --list mojo
-}
-
-
 function f_mojo_new_project() {
 # Add mojo project.
   if [[ -n "$(ls $WORKSPACE -1 | egrep '.failed|.bad')" ]]; then
 
=== modified file 'job-parts/osci_openstack_common.sh'
--- job-parts/osci_openstack_common.sh	2016-04-21 20:08:42 +0000
+++ job-parts/osci_openstack_common.sh	2016-05-18 11:59:22 +0000
@@ -5,11 +5,10 @@
 
 function f_openstack_bundle_constraint_mod() {
 # Bump some constraints to minimize resource footprint on undercloud.
-# FYI 4160M gets an alt flavor with ~1/2 the disk usage.
-# Undercloud should have a flavor which exactly matches mem, otherwise
-# the next largest flavor (probably 8G) will be chosen.
-  echo "Modifying bundle constraints (4G:3072M)."
-  $OSCI_ROOT/tools/find_replace.py -yd -i "$BUNDLE_FILE" -o "$BUNDLE_FILE" -f "mem=4G" -r "mem=3072M" || touch $WORKSPACE/fyi-${test:0:4}.bundle-constraint-mod.failed
+#  ex.
+#  echo "Modifying bundle constraints (4G:3072M)."
+#  $OSCI_ROOT/tools/find_replace.py -yd -i "$BUNDLE_FILE" -o "$BUNDLE_FILE" -f "mem=4G" -r "mem=3072M" || touch $WORKSPACE/fyi-${test:0:4}.bundle-constraint-mod.failed
+echo " . FYI no bundle mem constraint modifications"
 }
 
 
@@ -97,6 +96,95 @@
 }
 
 
+function f_amulet_squash_00setup() {
+# Guard against ppa additions and deb package installations as are
+# customarily attempted in tests/00-setup and/or tests/setup/00-setup.
+# That is dangerous in CI automation as we need to control the juju
+# and related tools versions on the slaves.  Just squash them here.
+  f_line "Squashing 00-setup files if they exist"
+  AMULET_SETUP_FILES="$(find ./tests -type f -executable -name 00-setup -print)"
+  if [[ ! -z "$AMULET_SETUP_FILES" ]]; then
+    for f in $AMULET_SETUP_FILES; do
+      echo " - Setting $f as non-executable (-x)"
+      chmod -x $f
+      stat $f
+    done
+  else
+    echo " . No executable amulet 00-setup file(s) found (OK)."
+  fi
+}
+
+
+function f_amulet_naked_test_run() {
+# LEGACY!  Run a single named amulet test. Must already be bootstrapped.
+# This should only be used when amulet smoke tests are not defined in
+# the charm's tox.ini.  Once all charms use tox + bundletester for
+# amulet and amulet smoke, this can be deprecated.
+  if [[ -z "$CO_DIR" ]]; then
+    echo " ! Missing the required CO_DIR env var."
+    exit 1
+  fi
+  if [[ -z "$AMULET_TEST_NAME" ]]; then
+    echo " ! Missing the required AMULET_TEST_NAME env var."
+    exit 1
+  fi
+  cd $CO_DIR
+  # Call the amulet test file directly
+  $AMULET_TEST_NAME |& tee $WORKSPACE/amulet-smoke.txt || true
+  if [[ "${PIPESTATUS[0]}" != "0" ]]; then
+    echo " ! Amulet smoke test failed: $AMULET_TEST_NAME."
+    touch $WORKSPACE/fyi-amulet-smoke.failed
+  fi
+}
+
+
+function f_amulet_smoke_select_tests_fallback() {
+# LEGACY!  Only use this if/when a tox + bundletester amulet smoke
+# target is not defined or found.  This is intended only as a fallback
+# with automatic test selection.  OpenStack charms should all eventually
+# have tox-defined tests.
+
+  # Need to update this each cycle
+  export PREFER_CURRENT_LTS="trusty"
+  export BLACKLIST_CURRENT_OS_DEV="mitaka"
+
+  if [[ -z "$CO_DIR" ]]; then
+    echo " ! Missing the required CO_DIR env vars."
+    exit 1
+  fi
+  cd $CO_DIR
+
+  export AMULET_TESTS_ALL="$(find ./tests -maxdepth 1 -type f -executable -print | sort)"
+
+  # Select Preferred Test: latest trusty test combo which is enabled and executable
+  # Exclude *git* (deploy-from-source) amulet test definitions.
+  export AMULET_TEST_NAME="$(echo "$AMULET_TESTS_ALL" | grep $PREFER_CURRENT_LTS | grep -v git | grep -v $BLACKLIST_CURRENT_OS_DEV | tail -n 1)"
+
+  # Select Alternate Test: first in lexical order which is enabled and executable
+  # Exclude *git* (deploy-from-source) amulet test definitions.
+  if [[ -z "$AMULET_TEST_NAME" ]]; then
+    export AMULET_TEST_NAME="$(echo "$AMULET_TESTS_ALL" | grep -v git | grep -v $BLACKLIST_CURRENT_OS_DEV | head -n 1)"
+  fi
+
+  # Still no test found based on preference or blacklist, just run with one.
+  # Exclude *git* (deploy-from-source) amulet test definitions.
+  if [[ -z "$AMULET_TEST_NAME" ]]; then
+    export AMULET_TEST_NAME="$(echo "$AMULET_TESTS_ALL" | grep -v git | head -n 1)"
+  fi
+
+  # Fail and bail if none found.
+  if [[ -z "$AMULET_TEST_NAME" ]]; then
+    echo " ! NO TEST FOUND - Unable to determine which amulet test to run from $CO_DIR/tests"
+    ls -al $CO_DIR/tests
+    exit 1
+  fi
+
+  echo " . Available amulet tests:"
+  echo "$AMULET_TESTS_ALL"
+  echo " . Automatically selected test:  $AMULET_TEST_NAME"
+}
+
+
 function f_amulet_set_odl_location() {
   # Set ODL tarball location if not already set.
   [[ -z "$AMULET_ODL_LOCATION" ]] && export AMULET_ODL_LOCATION='http://10.245.161.162/swift/v1/opendaylight/distribution-karaf-0.2.4-Helium-SR4.tar.gz'
@@ -112,7 +200,6 @@
 
 function f_openstack_set_network_env_vars() {
   # Inspect the bootstrap node and set network environment variables based on that
-  dpkg-query --show ipcalc || sudo apt-get install ipcalc
   export NAME_SERVER="$(grep nameserver /etc/resolv.conf | head -n 1 | awk '{ print $2 }' | xargs)"
   export NET_ID="$(grep network ~/.juju/environments.yaml | head -n 1 | awk '{ print $2 }')"
 
@@ -184,7 +271,6 @@
   # Predictively set network environment variables before deployment exists
   f_novarc_undercloud
 
-  dpkg-query --show ipcalc || sudo apt-get install ipcalc
   export NAME_SERVER="$(grep nameserver /etc/resolv.conf | head -n 1 | awk '{ print $2 }' | xargs)"
   export NET_ID="$(grep network ~/.juju/environments.yaml | head -n 1 | awk '{ print $2 }')"
   export SUBNET_ID="$(neutron net-show $NET_ID | grep subnets | awk '{ print $4 }')"
@@ -256,6 +342,12 @@
     echo " ! Configure failed."
     touch $WORKSPACE/fyi-${test:0:4}.configure.failed
   fi
+
+  # Heat requires an action for Kilo and later to enable authorization
+  if [[ "$OPENSTACK_RELEASE" != *icehouse* ]]; then
+    echo " . Running domain-setup action on heat/0..."
+    juju action do --format=json heat/0 domain-setup
+  fi
 }
 
 
@@ -275,7 +367,6 @@
 
 
 function f_openstack_tempest_venv() {
-  sudo apt-get install python-virtualenv libffi-dev libssl-dev -y
   cd $OPENSTACK_CHARM_TESTING_ROOT/tempest
   virtualenv .venv
   .venv/bin/pip install -r requirements.txt
@@ -411,6 +502,12 @@
 }
 
 
+function f_novarc_artifactcloud() {
+  echo " . Sourcing artifactcloud novarc."
+  . ~/novarc-artifactcloud
+}
+
+
 function f_flavor_shrink() {
 # Shrink flavors for smaller/faster testing
   echo " + Shrinking flavors."
 
=== modified file 'job-parts/osci_osi_common.sh'
--- job-parts/osci_osi_common.sh	2016-03-04 05:37:48 +0000
+++ job-parts/osci_osi_common.sh	2016-05-18 11:59:22 +0000
@@ -35,21 +35,6 @@
 }
 
 
-function f_osi_install() {
-# Install or upgrade openstack-installer
-  echo " + Installing or upgrading openstack-installer..."
-  sudo add-apt-repository ppa:cloud-installer/experimental -y &> /dev/null || true
-  sudo apt-get update -y &> /dev/null || true
-  sudo apt-get install openstack -y || true
-  if [ -z "$(apt-cache policy openstack | grep 'Installed:')" ]; then
-    echo " ! openstack-installer install failed."
-    exit 1
-  fi
-  echo " . openstack-install version:"
-  openstack-install --version
-}
-
-
 function f_osi_config_file_pull_and_sanitize() {
 # Pull openstack-installer config yaml to workspace (sanitize keys and passwords)
   DEST_FILE="$WORKSPACE/osi-config.yaml"
@@ -263,7 +248,6 @@
     "multi"|"single"|"autopilot")
       echo " . Starting OSI built-in ${OSI_MODE} mode test..."
       f_osi_refresh
-      dpkg-query --show python3-pytest || sudo apt-get install python3-pytest -y
       cd $OSI_ROOT/integration
       py.test-3 tests/test_${OSI_MODE}.py |& tee $WORKSPACE/osi-test-${OSI_MODE}.txt
       ret_code=${PIPESTATUS[0]}
 
=== modified file 'job-parts/osci_tools_common.sh'
--- job-parts/osci_tools_common.sh	2016-03-09 19:26:45 +0000
+++ job-parts/osci_tools_common.sh	2016-05-18 11:59:22 +0000
@@ -46,8 +46,6 @@
   [[ -z "$MIG_TOOLS_REPO" ]] && export MIG_TOOLS_REPO="https://github.com/openstack-charmers/migration-tools"
   [[ -z "$MIG_TOOLS_ROOT" ]] && export MIG_TOOLS_ROOT="$HOME/tools/migration-tools"
 
-  dpkg-query --show bzr-fastimport || sudo apt-get install bzr-fastimport -y
-
   if [[ -d $MIG_TOOLS_ROOT ]]; then
     echo " - Removing existing dir @ $MIG_TOOLS_ROOT"
     rm -rf $MIG_TOOLS_ROOT