Some small fixes found while doing an e2e test with devserver changes.
1) Alex's change to not exit 0 totally now clobbers you shadow config
even if you say no.
2) Release config should be updated for R27.
3) Site RPC interface -- better logging.
4) Site_Suite didn't actually allow an int override -- kept on casting it
to a string.
BUG=None
TEST=Ran through devserver test using cli/atest suite create and setup
autotest with shadow config.
Change-Id: Ie7f61fe95c3a642455de33416367085e159c3947
Reviewed-on: https://gerrit.chromium.org/gerrit/43429
Commit-Queue: Chris Sosa <sosa@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
diff --git a/cli/site_suite.py b/cli/site_suite.py
index bff7ef1..bd3e64e 100644
--- a/cli/site_suite.py
+++ b/cli/site_suite.py
@@ -58,7 +58,7 @@
self.parser.add_option('-f', '--file_bugs', default=False,
help='File bugs on test failures.',
action='store_true', metavar='FILE_BUGS')
- self.parser.add_option('-n', '--num',
+ self.parser.add_option('-n', '--num', type=int,
help='Number of machines to schedule across.',
metavar='NUM')
self.parser.add_option('-p', '--pool', help='Pool of machines to use.',
diff --git a/frontend/afe/site_rpc_interface.py b/frontend/afe/site_rpc_interface.py
index a50763d..40447dd 100644
--- a/frontend/afe/site_rpc_interface.py
+++ b/frontend/afe/site_rpc_interface.py
@@ -97,10 +97,9 @@
"""
# All suite names are assumed under test_suites/control.XX.
suite_name = canonicalize_suite_name(suite_name)
-
if type(num) is not int and num is not None:
- raise error.SuiteArgumentException('Ill specified num argument. Must be'
- ' an integer or None.')
+ raise error.SuiteArgumentException('Ill specified num argument %r. '
+ 'Must be an integer or None.' % num)
if num == 0:
logging.warning("Can't run on 0 hosts; using default.")
num = None
diff --git a/site_utils/autoupdate/release_config.ini b/site_utils/autoupdate/release_config.ini
index 4443a15..d9a7989 100644
--- a/site_utils/autoupdate/release_config.ini
+++ b/site_utils/autoupdate/release_config.ini
@@ -12,7 +12,7 @@
# are case-insensitive). Option next_branch is the name of the next branch to be
# cut, or equivalently the branch tag attached to most current builds.
branch_points: R10, R11, R12, R13, R14, R15, R16, R17, R18, R19, R20, R21, R22,
- R23, R24, R25
+ R23, R24, R25, R26
bp_r10: 0.10.156.0
bp_r11: 0.11.257.0
bp_r12: 0.12.433.0
@@ -38,4 +38,5 @@
bp_r24: 3125.0.0
# R25 actual branchpoint is 3428.0.0
bp_r25: 3435.0.0
-next_branch: R26
+bp_r26: 3701.0.0
+next_branch: R27
diff --git a/site_utils/setup_dev_autotest.sh b/site_utils/setup_dev_autotest.sh
index 2f6fb2b..f3b39d9 100755
--- a/site_utils/setup_dev_autotest.sh
+++ b/site_utils/setup_dev_autotest.sh
@@ -66,6 +66,7 @@
SHADOW_CONFIG_PATH="${AUTOTEST_DIR}/shadow_config.ini"
echo "Autotest supports local overrides of global configuration through a "
echo "'shadow' configuration file. Setting one up for you now."
+CLOBBER=0
if [ -f ${SHADOW_CONFIG_PATH} ]; then
clobber=
while read -n 1 -p "Clobber existing shadow config? [Y/n]: " clobber; do
@@ -76,12 +77,16 @@
echo "Please enter y or n."
done
if [[ "${clobber}" = 'n' || "${clobber}" = 'N' ]]; then
+ CLOBBER=1
echo "Refusing to clobber existing shadow_config.ini."
+ else
+ echo "Clobbering existing shadow_config.ini."
fi
- echo "Clobbering existing shadow_config.ini."
fi
-cat > "${SHADOW_CONFIG_PATH}" <<EOF
+# Create clean shadow config if we're replacing it/creating a new one.
+if [ $CLOBBER -eq 0 ]; then
+ cat > "${SHADOW_CONFIG_PATH}" <<EOF
[AUTOTEST_WEB]
host: localhost
password: ${PASSWD}
@@ -95,7 +100,8 @@
[SCHEDULER]
drones: localhost
EOF
-echo -e "Done!\n"
+ echo -e "Done!\n"
+fi
echo "Installing needed Ubuntu packages..."
PKG_LIST="mysql-server mysql-common libapache2-mod-python python-mysqldb \