You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by jc...@apache.org on 2016/08/29 19:20:03 UTC
aurora git commit: Configure ssh for e2e tests once globally,
rather than as part of a specific test case.
Repository: aurora
Updated Branches:
refs/heads/master 5c95395ad -> 874625e8f
Configure ssh for e2e tests once globally, rather than as part of a specific test case.
Reviewed at https://reviews.apache.org/r/51500/
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/874625e8
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/874625e8
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/874625e8
Branch: refs/heads/master
Commit: 874625e8f9e2fa09cf0bbe5cc76504efb9cf38d0
Parents: 5c95395
Author: Joshua Cohen <jc...@apache.org>
Authored: Mon Aug 29 14:19:55 2016 -0500
Committer: Joshua Cohen <jc...@apache.org>
Committed: Mon Aug 29 14:19:55 2016 -0500
----------------------------------------------------------------------
src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/874625e8/src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
----------------------------------------------------------------------
diff --git a/src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh b/src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
index 1a668dd..7c32c94 100755
--- a/src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
+++ b/src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
@@ -244,9 +244,7 @@ test_announce() {
validate_serverset "/aurora/$_jobkey"
}
-test_run() {
- local _jobkey=$1
-
+setup_ssh() {
# Create an SSH public key so that local SSH works without a password.
local _ssh_key=~/.ssh/id_rsa
rm -f ${_ssh_key}*
@@ -255,6 +253,10 @@ test_run() {
# See: https://issues.apache.org/jira/browse/AURORA-1728
echo >> ~/.ssh/authorized_keys
cat ${_ssh_key}.pub >> ~/.ssh/authorized_keys
+}
+
+test_run() {
+ local _jobkey=$1
# Using the sandbox contents as a proxy for functioning SSH. List sandbox contents, looking for
# the .logs directory. We expect to find 3 instances.
@@ -479,6 +481,8 @@ TEST_JOB_EPHEMERAL_DAEMON_WITH_FINAL_ARGS=(
trap collect_result EXIT
aurorabuild all
+setup_ssh
+
test_version
test_http_example "${TEST_JOB_ARGS[@]}"
test_health_check