From dbe4d46aebbfcdeee55795d4ebde9175ded2316d Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 14 Dec 2012 11:21:13 +0100 Subject: [PATCH] there can only be one --- liveboot_testdeploy.sh | 14 +++++++------- schedule_selenium_tests.sh | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/liveboot_testdeploy.sh b/liveboot_testdeploy.sh index 12b9beb..c1be952 100755 --- a/liveboot_testdeploy.sh +++ b/liveboot_testdeploy.sh @@ -12,8 +12,8 @@ TESTSERVER=pserver2 TESTSERVER_MGMT_IP=192.168.178.49 TESTSERVER_MGMT_PASSWD_FILE=/etc/jenkins/pserver2.ipmi -TFTP_TARGET=/srv/tftp/liveboot -HTTP_TARGET=/var/www/liveboot/ +##TFTP_TARGET=/srv/tftp/liveboot +##HTTP_TARGET=/var/www/liveboot/ # @@ -52,11 +52,11 @@ fi ### command="/bin/cp ${SSH_ORIGINAL_COMMAND#* }",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="192.168.178.17" ### thanks to http://larstobi.blogspot.de/2011/01/restrict-ssh-access-to-one-command-but.html ### -ssh liveboot@riserver cp -v $SOURCE_DIR/vmlinuz $TFTP_TARGET/pserver2_vmlinuz -ssh liveboot@riserver cp -v $SOURCE_DIR/initramfs.cpio.gz $TFTP_TARGET/pserver2_initramfs.cpio.gz -echo "Ok, copied vmlinuz and initramfs.cpio.gz from $SOURCE_DIR to riserver:$TFTP_TARGET/" -ssh liveboot@riserver cp -v $SOURCE_DIR/root.tar.xz $HTTP_TARGET/pserver2_root.tar.xz -echo "Ok, copied root.tar.xz from $SOURCE_DIR to riserver:$HTTP_TARGET/" +#ssh liveboot@riserver cp -v $SOURCE_DIR/vmlinuz $TFTP_TARGET/pserver2_vmlinuz +#ssh liveboot@riserver cp -v $SOURCE_DIR/initramfs.cpio.gz $TFTP_TARGET/pserver2_initramfs.cpio.gz +#echo "Ok, copied vmlinuz and initramfs.cpio.gz from $SOURCE_DIR to riserver:$TFTP_TARGET/" +#ssh liveboot@riserver cp -v $SOURCE_DIR/root.tar.xz $HTTP_TARGET/pserver2_root.tar.xz +#echo "Ok, copied root.tar.xz from $SOURCE_DIR to riserver:$HTTP_TARGET/" # # reboot TESTSERVER diff --git a/schedule_selenium_tests.sh b/schedule_selenium_tests.sh index abb552a..c80bf79 100755 --- a/schedule_selenium_tests.sh +++ b/schedule_selenium_tests.sh @@ -21,6 +21,7 @@ elif [ "$TEST_BROWSER" = "chrome" ] ; then TEST_PORT=4445 elif [ "$TEST_BROWSER" = "ie9" ] ; then TEST_PORT=4446 + TEST_BROWSER="ie" else figlet "unknown browser" exit 1 -- 2.39.5