Merge lp:~sinzui/juju-ci-tools/remove-common-startup into lp:juju-ci-tools

[Curtis Hovey]

Remove common-startup.sh

No CI jobs are directly using common-startup, or passing --run-startup to script. Let this code die.

PS All the jobs I changed have passed CI.

[John George (jog)]

Small exception message change needed.

review: Needs Fixing

[lp:~sinzui/juju-ci-tools/remove-common-startup]

967. By Curtis Hovey on 2015-05-29

Remove exception...--new-juju-bin is required.

[John George (jog)]

Thank you.

review: Approve

=== removed file 'common-startup.sh'
--- common-startup.sh	2015-05-19 16:24:24 +0000
+++ common-startup.sh	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-set -eu
-set +x
-: ${SCRIPTS=$(readlink -f $(dirname $0))}
-export PATH="$SCRIPTS:$PATH"
-
-export JUJU_HOME=${JUJU_HOME:-$HOME/cloud-city}
-: ${JUJU_REPOSITORY=$HOME/repository}
-export JUJU_REPOSITORY
-
-export MACHINES=""
-source $JUJU_HOME/juju-qa.jujuci
-set -x
-
-# Determine BRANCH, REVNO, VERSION, and PACKAGES under test.
-RELEASE=$(lsb_release -sr)
-ARCH=$(dpkg --print-architecture)
-if [[ -n ${revision_build:-} ]]; then
-    VERSION=$($SCRIPTS/jujuci.py get-build-vars --version $revision_build)
-    PACKAGES_JOB="publish-revision"
-    JUJU_LOCAL_DEB="juju-local_$VERSION-0ubuntu1~$RELEASE.1~juju1_all.deb"
-    JUJU_CORE_DEB="juju-core_$VERSION-0ubuntu1~$RELEASE.1~juju1_$ARCH.deb"
-    $SCRIPTS/jujuci.py get-build-vars --summary --env $ENV $revision_build
-elif [[ -n ${VERSION:-} ]]; then
-    PACKAGES_JOB="certify-ubuntu-packages"
-    JUJU_LOCAL_DEB=$(
-        $SCRIPTS/jujuci.py list $PACKAGES_JOB "juju-local_*_all.deb")
-    JUJU_CORE_DEB=$(
-        $SCRIPTS/jujuci.py list $PACKAGES_JOB "juju-core_*_$ARCH.deb")
-    echo "Testing $VERSION on $ENV"
-else
-    echo "Job didn't define revision_build or VERSION"
-    exit 1
-fi
-
-# Provide the juju-core and juju-local packages to the test
-$SCRIPTS/jujuci.py get $PACKAGES_JOB $JUJU_LOCAL_DEB
-$SCRIPTS/jujuci.py get $PACKAGES_JOB $JUJU_CORE_DEB
-dpkg-deb -x ./$JUJU_CORE_DEB extracted-bin
-export NEW_JUJU_BIN=$(readlink -f $(dirname $(find extracted-bin -name juju)))

=== modified file 'deploy_stack.py'
--- deploy_stack.py	2015-05-15 19:37:31 +0000
+++ deploy_stack.py	2015-05-29 20:53:21 +0000
@@ -381,8 +381,6 @@
 def add_path_args(parser):
     parser.add_argument('--new-juju-bin', default=None,
                         help='Dirctory containing the new Juju binary.')
-    parser.add_argument('--run-startup', help='Run common-startup.sh.',
-                        action='store_true', default=False)
 
 
 def add_output_args(parser):
@@ -402,22 +400,7 @@
 
 
 def get_juju_path(args):
-    if args.run_startup:
-        env = dict(os.environ)
-        env.update({
-            'ENV': args.env,
-        })
-        scripts = os.path.dirname(os.path.abspath(sys.argv[0]))
-        subprocess.check_call(
-            ['bash', '{}/common-startup.sh'.format(scripts)], env=env)
-        bin_path = subprocess.check_output(['find', 'extracted-bin', '-name',
-                                            'juju']).rstrip('\n')
-        juju_path = os.path.abspath(bin_path)
-    elif args.new_juju_bin is None:
-        raise Exception('Either --new-juju-bin or --run-startup must be'
-                        ' supplied.')
-    else:
-        juju_path = os.path.join(args.new_juju_bin, 'juju')
+    juju_path = os.path.join(args.new_juju_bin, 'juju')
     return juju_path
 
 

=== modified file 'test_deploy_stack.py'
--- test_deploy_stack.py	2015-05-15 19:45:42 +0000
+++ test_deploy_stack.py	2015-05-29 20:53:21 +0000
@@ -8,7 +8,6 @@
 import os
 from StringIO import StringIO
 import subprocess
-import sys
 from textwrap import dedent
 from unittest import TestCase
 
@@ -80,7 +79,7 @@
         cmd_line = ['proc', '--new-juju-bin', '/tmp/juju']
         with patch('sys.argv', cmd_line):
             args_dict = parser.parse_args().__dict__
-        expected = {'run_startup': False, 'new_juju_bin': '/tmp/juju'}
+        expected = {'new_juju_bin': '/tmp/juju'}
         self.assertEqual(args_dict, expected)
 
     def test_add_path_args_new_juju_bin_default(self):
@@ -112,26 +111,10 @@
         self.assertEqual(args_dict, expected)
 
     def test_get_juju_path_new_juju_bin(self):
-        args = Namespace(new_juju_bin='/tmp/juju', run_startup=False)
+        args = Namespace(new_juju_bin='/tmp/juju')
         juju_path = get_juju_path(args)
         self.assertEqual(juju_path, '/tmp/juju/juju')
 
-    def test_get_juju_path_run_startup(self):
-        args = Namespace(run_startup=True, env='proc')
-        with patch.dict(os.environ, {'PATH': os.environ['PATH']}):
-            with patch('subprocess.check_call', autospec=True) as cc_mock:
-                with patch('subprocess.check_output',
-                           return_value='foo\n') as co_mock:
-                    juju_path = get_juju_path(args)
-        env = dict(os.environ)
-        scripts = os.path.dirname(os.path.abspath(sys.argv[0]))
-        env['ENV'] = args.env
-        cc_mock.assert_called_once_with(
-            ['bash', '{}/common-startup.sh'.format(scripts)], env=env)
-        co_mock.assert_called_once_with(
-            ['find', 'extracted-bin', '-name', 'juju'])
-        self.assertEqual(juju_path, os.path.abspath('foo'))
-
     def test_get_log_level_debug(self):
         parser = ArgumentParser('proc')
         add_output_args(parser)
@@ -796,7 +779,6 @@
             logs='bar',
             machine=[],
             new_juju_bin=None,
-            run_startup=False,
             series=None,
             upgrade=False,
             verbose=False,