tools/run-centos: cleanups and move to using read-dependencies

These changes are all in an effort to get tools/run-centos using
read-dependencies rather than the 'setup-centos' script with a separate
set of dependencies listed.

 - tools/read-dependencies: support taking multiple --requirements
   options.  This allows run-centos to get both test and build
   dependencies.  Ultimately, I think it might be nicer for
   read-dependencies to take a list of "goals" (build, test, run or
   test-tox) rather than having the caller need to know to provide
   multiple --requirements.

 - packages/pkg-deps.json: drop the version on the sudo package.
   centos 6 has newer (1.8.6p3) version than listed, so its not a problem.

 - test_handler_disk_setup.py: a test case here was using assertLogs
   which is not present in the version of unittest2 that is available in
   centos 6 epel. We just adjust it to use with_logs = True.

 - tools/run-cents:
   - improve usage with example
   - add 'inside_as_cd' to provide the dir you want to cd first to.
   - avoid the intermediate tarball on disk in the container.
   - add 'prep' subcommand and use it to install pre-dependencies.
   - use read-dependencies.

1 files changed, 0 insertions, 49 deletions

diff --git a/tools/setup-centos b/tools/setup-centos
deleted file mode 100755
index bc5da8a7..00000000
--- a/tools/setup-centos
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-# This file is part of cloud-init. See LICENSE file for license information.
-set -fux
-export LANG=C
-
-packages="
-    file
-    git
-    pyserial
-    python-argparse
-    python-cheetah
-    python-configobj
-    python-devel
-    python-jinja2
-    python-jsonpatch
-    python-oauthlib
-    python-pip
-    python-prettytable
-    python-requests
-    python-six
-    PyYAML
-    rpm-build
-"
-
-pips="
-    contextlib2
-    httpretty
-    mock
-    nose
-    pep8
-    unittest2
-"
-
-error() { echo "$@" 1>&2; }
-fail() { [ $# -eq 0 ] || error "$@"; exit 1; }
-info() { echo "$@"; }
-
-pips=$(for p in $pips; do echo "$p"; done | sort -u)
-packages=$(for p in $packages; do echo "$p"; done | sort -u)
-
-if ! rpm -q epel-release >/dev/null; then
-    yum install --assumeyes epel-release ||
-        fail "failed: yum install epel-release"
-fi
-yum install --assumeyes $packages ||
-        fail "failed: yum install" "$packages"
-
-pip install --upgrade $pips ||
-    fail "failed: pip install $pips"