@@ -, +, @@
---
.../autotest-070-update-3.2-to-4.0-master-s3.cfg | 4 +-
.../autotest-071-update-3.2-to-4.0-master-s4.cfg | 6 +--
.../autotest-072-update-3.2-to-4.0-backup-s3.cfg | 4 +-
.../autotest-073-update-3.2-to-4.0-backup-s4.cfg | 6 +--
.../autotest-074-update-3.2-to-4.0-slave-s3.cfg | 4 +-
.../autotest-075-update-3.2-to-4.0-slave-s4.cfg | 4 +-
.../autotest-076-update-3.2-to-4.0-member-s3.cfg | 4 +-
.../autotest-077-update-3.2-to-4.0-member-s4.cfg | 4 +-
.../examples/jenkins/autotest-090-master-s3.cfg | 4 +-
.../examples/jenkins/autotest-091-master-s4.cfg | 6 +--
.../examples/jenkins/autotest-092-backup-s3.cfg | 4 +-
.../examples/jenkins/autotest-093-backup-s4.cfg | 6 +--
.../examples/jenkins/autotest-094-slave-s3.cfg | 4 +-
.../examples/jenkins/autotest-095-slave-s4.cfg | 4 +-
.../examples/jenkins/autotest-096-member-s3.cfg | 4 +-
.../examples/jenkins/autotest-097-member-s4.cfg | 4 +-
.../jenkins/autotest-100-app-master-s3.cfg | 4 +-
.../jenkins/autotest-100-app-master-single.cfg | 4 +-
.../jenkins/autotest-101-app-master-s4.cfg | 6 +--
.../jenkins/autotest-102-app-backup-s3.cfg | 4 +-
.../jenkins/autotest-103-app-backup-s4.cfg | 6 +--
.../examples/jenkins/autotest-104-app-slave-s3.cfg | 4 +-
.../examples/jenkins/autotest-105-app-slave-s4.cfg | 4 +-
.../jenkins/autotest-106-app-member-s3.cfg | 4 +-
.../jenkins/autotest-107-app-member-s4.cfg | 4 +-
...t-110-update-3.2-to-4.0-appupdate-master-s3.cfg | 4 +-
...0-update-3.2-to-4.0-appupdate-master-single.cfg | 4 +-
...t-111-update-3.2-to-4.0-appupdate-master-s4.cfg | 6 +--
...t-112-update-3.2-to-4.0-appupdate-backup-s3.cfg | 4 +-
...t-113-update-3.2-to-4.0-appupdate-backup-s4.cfg | 6 +--
...st-114-update-3.2-to-4.0-appupdate-slave-s3.cfg | 4 +-
...st-115-update-3.2-to-4.0-appupdate-slave-s4.cfg | 4 +-
...t-116-update-3.2-to-4.0-appupdate-member-s3.cfg | 4 +-
...t-117-update-3.2-to-4.0-appupdate-member-s4.cfg | 4 +-
.../jenkins/autotest-120-appupdate-master-s3.cfg | 4 +-
.../autotest-120-appupdate-master-single.cfg | 4 +-
.../jenkins/autotest-121-appupdate-master-s4.cfg | 6 +--
.../jenkins/autotest-122-appupdate-backup-s3.cfg | 4 +-
.../jenkins/autotest-123-appupdate-backup-s4.cfg | 6 +--
.../jenkins/autotest-124-appupdate-slave-s3.cfg | 4 +-
.../jenkins/autotest-125-appupdate-slave-s4.cfg | 4 +-
.../jenkins/autotest-126-appupdate-member-s3.cfg | 4 +-
.../jenkins/autotest-127-appupdate-member-s4.cfg | 4 +-
...autotest-221-admember-module-w2k8r2-english.cfg | 4 +-
...ember-module-w2k8r2-english-other-join-user.cfg | 4 +-
...test-223-admember-module-w2k12-german-slave.cfg | 4 +-
...dmember-module-w2k12-german-other-join-user.cfg | 4 +-
...autotest-225-admember-module-w2k12r2-france.cfg | 4 +-
...installation-w2k8r2-english-other-join-user.cfg | 4 +-
...st-226-admember-installation-w2k8r2-english.cfg | 4 +-
...27-admember-installation-w2k12-german-slave.cfg | 4 +-
...r-installation-w2k12-german-other-join-user.cfg | 4 +-
...st-229-admember-installation-w2k12r2-france.cfg | 4 +-
.../jenkins/ucsschool-performance-30000.cfg | 6 +--
.../examples/jenkins/ucsschool-performance-500.cfg | 6 +--
.../jenkins/ucsschool-performance-65000.cfg | 6 +--
.../examples/jenkins/utils/utils-local.sh | 54 +++++++++++++---------
57 files changed, 88 insertions(+), 216 deletions(-)
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-070-update-3.2-to-4.0-master-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-070-update-3.2-to-4.0-master-s3.cfg
@@ -56,9 +56,7 @@ command4:
. utils.sh && wait_for_reboot
command5:
. utils.sh; [ -f UCS_UPDATED ] && run_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master070_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master070_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master070_IP]:"/var/log/univention/{join,setup,listener,updater}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master070_IP]
command6:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-071-update-3.2-to-4.0-master-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-071-update-3.2-to-4.0-master-s4.cfg
@@ -56,11 +56,7 @@ command4:
. utils.sh && wait_for_reboot
command5:
. utils.sh; [ -f UCS_UPDATED ] && run_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master071_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master071_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master071_IP]:"/var/log/univention/{join,setup,listener,updater}.log" .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master071_IP]:/var/log/univention/connector* .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master071_IP]:/var/log/samba/* .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results-samba [master071_IP]
command6:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-072-update-3.2-to-4.0-backup-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-072-update-3.2-to-4.0-backup-s3.cfg
@@ -89,9 +89,7 @@ command5:
. utils.sh && wait_for_reboot
command6:
. utils.sh; [ -f UCS_UPDATED ] && run_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup072_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup072_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup072_IP]:"/var/log/univention/{join,setup,listener,updater}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [backup072_IP]
command7:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-073-update-3.2-to-4.0-backup-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-073-update-3.2-to-4.0-backup-s4.cfg
@@ -89,11 +89,7 @@ command5:
. utils.sh && wait_for_reboot
command6:
. utils.sh; [ -f UCS_UPDATED ] && run_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup073_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup073_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup073_IP]:"/var/log/univention/{join,setup,listener,updater}.log" .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup073_IP]:/var/log/univention/connector* .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup073_IP]:/var/log/samba/* .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results-samba [backup073_IP]
command7:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-074-update-3.2-to-4.0-slave-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-074-update-3.2-to-4.0-slave-s3.cfg
@@ -89,9 +89,7 @@ command5:
. utils.sh && wait_for_reboot
command6:
. utils.sh; [ -f UCS_UPDATED ] && run_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave074_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave074_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave074_IP]:"/var/log/univention/{join,setup,listener,updater}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [slave074_IP]
command7:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-075-update-3.2-to-4.0-slave-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-075-update-3.2-to-4.0-slave-s4.cfg
@@ -89,9 +89,7 @@ command5:
. utils.sh && wait_for_reboot
command6:
. utils.sh; [ -f UCS_UPDATED ] && run_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave075_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave075_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave075_IP]:"/var/log/univention/{join,setup,listener,updater}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [slave075_IP]
command7:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-076-update-3.2-to-4.0-member-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-076-update-3.2-to-4.0-member-s3.cfg
@@ -89,9 +89,7 @@ command5:
. utils.sh && wait_for_reboot
command6:
. utils.sh; [ -f UCS_UPDATED ] && run_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member076_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member076_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member076_IP]:"/var/log/univention/{join,setup,listener,updater}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [member076_IP]
command7:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-077-update-3.2-to-4.0-member-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-077-update-3.2-to-4.0-member-s4.cfg
@@ -89,9 +89,7 @@ command5:
. utils.sh && wait_for_reboot
command6:
. utils.sh; [ -f UCS_UPDATED ] && run_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member077_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member077_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member077_IP]:"/var/log/univention/{join,setup,listener,updater}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [member077_IP]
command7:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-090-master-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-090-master-s3.cfg
@@ -54,9 +54,7 @@ command3:
. utils.sh && wait_for_reboot
command4:
. utils.sh; run_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master090_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master090_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master090_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master090_IP]
command5:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-091-master-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-091-master-s4.cfg
@@ -54,11 +54,7 @@ command3:
. utils.sh && wait_for_reboot
command4:
. utils.sh; run_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master091_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master091_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master091_IP]:"/var/log/univention/{join,setup,listener}.log" .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master091_IP]:/var/log/univention/connector* .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master091_IP]:/var/log/samba/* .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results-samba [master091_IP]
command5:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-092-backup-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-092-backup-s3.cfg
@@ -86,9 +86,7 @@ command4:
. utils.sh && wait_for_reboot
command5:
. utils.sh; run_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup092_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup092_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup092_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [backup092_IP]
command6:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-093-backup-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-093-backup-s4.cfg
@@ -88,11 +88,7 @@ command4:
. utils.sh && wait_for_reboot
command5:
. utils.sh; run_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup093_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup093_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup093_IP]:"/var/log/univention/{join,setup,listener}.log" .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup093_IP]:/var/log/univention/connector* .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup093_IP]:/var/log/samba/* .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results-samba [backup093_IP]
command6:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-094-slave-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-094-slave-s3.cfg
@@ -86,9 +86,7 @@ command4:
. utils.sh && wait_for_reboot
command5:
. utils.sh; run_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave094_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave094_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave094_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [slave094_IP]
command6:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-095-slave-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-095-slave-s4.cfg
@@ -88,9 +88,7 @@ command4:
. utils.sh && wait_for_reboot
command5:
. utils.sh; run_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave095_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave095_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave095_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [slave095_IP]
command6:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-096-member-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-096-member-s3.cfg
@@ -86,9 +86,7 @@ command4:
. utils.sh && wait_for_reboot
command5:
. utils.sh; run_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member096_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member096_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member096_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [member096_IP]
command6:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-097-member-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-097-member-s4.cfg
@@ -86,9 +86,7 @@ command4:
. utils.sh && wait_for_reboot
command5:
. utils.sh; run_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member097_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member097_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member097_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [member097_IP]
command6:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-100-app-master-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-100-app-master-s3.cfg
@@ -56,9 +56,7 @@ command4:
. utils.sh; install_apps_test_packages APP_ID
command5:
. utils.sh; run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master100_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master100_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master100_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master100_IP]
command6:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-100-app-master-single.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-100-app-master-single.cfg
@@ -62,9 +62,7 @@ command6:
. utils.sh; run_join_scripts
command7:
. utils.sh; run_appcenter_uninstall_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master100_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master100_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master100_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master100_IP]
command8:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-101-app-master-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-101-app-master-s4.cfg
@@ -56,11 +56,7 @@ command4:
. utils.sh; install_apps_test_packages APP_ID
command5:
. utils.sh; run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master101_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master101_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master101_IP]:"/var/log/univention/{join,setup,listener}.log" .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master101_IP]:/var/log/univention/connector* .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master101_IP]:/var/log/samba/* .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results-samba [master101_IP]
command6:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-102-app-backup-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-102-app-backup-s3.cfg
@@ -90,9 +90,7 @@ command5:
. utils.sh; install_apps_test_packages APP_ID
command6:
. utils.sh; run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup102_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup102_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup102_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [backup102_IP]
command7:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-103-app-backup-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-103-app-backup-s4.cfg
@@ -90,11 +90,7 @@ command5:
. utils.sh; install_apps_test_packages APP_ID
command6:
. utils.sh; run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup103_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup103_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup103_IP]:"/var/log/univention/{join,setup,listener}.log" .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup103_IP]:/var/log/univention/connector* .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup103_IP]:/var/log/samba/* .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results-samba [backup103_IP]
command7:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-104-app-slave-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-104-app-slave-s3.cfg
@@ -90,9 +90,7 @@ command5:
. utils.sh; install_apps_test_packages APP_ID
command6:
. utils.sh; run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave104_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave104_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave104_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [slave104_IP]
command7:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-105-app-slave-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-105-app-slave-s4.cfg
@@ -90,9 +90,7 @@ command5:
. utils.sh; install_apps_test_packages APP_ID
command6:
. utils.sh; run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave105_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave105_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave105_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [slave105_IP]
command7:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-106-app-member-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-106-app-member-s3.cfg
@@ -90,9 +90,7 @@ command5:
. utils.sh; install_apps_test_packages APP_ID
command6:
. utils.sh; run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member106_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member106_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member106_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [member106_IP]
command7:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-107-app-member-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-107-app-member-s4.cfg
@@ -90,9 +90,7 @@ command5:
. utils.sh; install_apps_test_packages APP_ID
command6:
. utils.sh; run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member107_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member107_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member107_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [member107_IP]
command7:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-110-update-3.2-to-4.0-appupdate-master-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-110-update-3.2-to-4.0-appupdate-master-s3.cfg
@@ -63,9 +63,7 @@ command6:
. utils.sh; install_apps_test_packages APP_ID
command7:
. utils.sh; [ -f UCS_UPDATED ] && run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master110_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master110_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master110_IP]:"/var/log/univention/{join,setup,listener,updater}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master110_IP]
command8:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-110-update-3.2-to-4.0-appupdate-master-single.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-110-update-3.2-to-4.0-appupdate-master-single.cfg
@@ -63,9 +63,7 @@ command6:
. utils.sh; install_apps_test_packages APP_ID
command7:
. utils.sh; [ -f UCS_UPDATED ] && run_minimal_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master110_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master110_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master110_IP]:"/var/log/univention/{join,setup,listener,updater}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master110_IP]
command8:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-111-update-3.2-to-4.0-appupdate-master-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-111-update-3.2-to-4.0-appupdate-master-s4.cfg
@@ -63,11 +63,7 @@ command6:
. utils.sh; install_apps_test_packages APP_ID
command7:
. utils.sh; [ -f UCS_UPDATED ] && run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master111_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master111_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master111_IP]:"/var/log/univention/{join,setup,listener,updater}.log" .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master111_IP]:/var/log/univention/connector* .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master111_IP]:/var/log/samba/* .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results-samba [master111_IP]
command8:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-112-update-3.2-to-4.0-appupdate-backup-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-112-update-3.2-to-4.0-appupdate-backup-s3.cfg
@@ -103,9 +103,7 @@ command7:
. utils.sh; install_apps_test_packages APP_ID
command8:
. utils.sh; [ -f UCS_UPDATED ] && run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup112_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup112_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup112_IP]:"/var/log/univention/{join,setup,listener,updater}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [backup112_IP]
command9:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-113-update-3.2-to-4.0-appupdate-backup-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-113-update-3.2-to-4.0-appupdate-backup-s4.cfg
@@ -103,11 +103,7 @@ command7:
. utils.sh; install_apps_test_packages APP_ID
command8:
. utils.sh; [ -f UCS_UPDATED ] && run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup113_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup113_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup113_IP]:"/var/log/univention/{join,setup,listener,updater}.log" .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup113_IP]:/var/log/univention/connector* .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup113_IP]:/var/log/samba/* .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results-samba [backup113_IP]
command9:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-114-update-3.2-to-4.0-appupdate-slave-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-114-update-3.2-to-4.0-appupdate-slave-s3.cfg
@@ -102,9 +102,7 @@ command7:
. utils.sh; install_apps_test_packages APP_ID
command8:
. utils.sh; [ -f UCS_UPDATED ] && run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave114_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave114_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave114_IP]:"/var/log/univention/{join,setup,listener,updater}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [slave114_IP]
command9:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-115-update-3.2-to-4.0-appupdate-slave-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-115-update-3.2-to-4.0-appupdate-slave-s4.cfg
@@ -103,9 +103,7 @@ command7:
. utils.sh; install_apps_test_packages APP_ID
command8:
. utils.sh; [ -f UCS_UPDATED ] && run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave115_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave115_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave115_IP]:"/var/log/univention/{join,setup,listener,updater}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [slave115_IP]
command9:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-116-update-3.2-to-4.0-appupdate-member-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-116-update-3.2-to-4.0-appupdate-member-s3.cfg
@@ -103,9 +103,7 @@ command7:
. utils.sh; install_apps_test_packages APP_ID
command8:
. utils.sh; [ -f UCS_UPDATED ] && run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member116_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member116_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member116_IP]:"/var/log/univention/{join,setup,listener,updater}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [member116_IP]
command9:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-117-update-3.2-to-4.0-appupdate-member-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-117-update-3.2-to-4.0-appupdate-member-s4.cfg
@@ -103,9 +103,7 @@ command7:
. utils.sh; install_apps_test_packages APP_ID
command8:
. utils.sh; [ -f UCS_UPDATED ] && run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member117_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member117_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member117_IP]:"/var/log/univention/{join,setup,listener,updater}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [member117_IP]
command9:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-120-appupdate-master-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-120-appupdate-master-s3.cfg
@@ -59,9 +59,7 @@ command5:
. utils.sh; install_apps_test_packages APP_ID
command6:
. utils.sh; run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master120_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master120_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master120_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master120_IP]
command7:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-120-appupdate-master-single.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-120-appupdate-master-single.cfg
@@ -59,9 +59,7 @@ command5:
. utils.sh; install_apps_test_packages APP_ID
command6:
. utils.sh; run_minimal_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master120_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master120_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master120_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master120_IP]
command7:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-121-appupdate-master-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-121-appupdate-master-s4.cfg
@@ -59,11 +59,7 @@ command5:
. utils.sh; install_apps_test_packages APP_ID
command6:
. utils.sh; run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master121_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master121_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master121_IP]:"/var/log/univention/{join,setup,listener}.log" .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master121_IP]:/var/log/univention/connector* .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master121_IP]:/var/log/samba/* .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results-samba [master121_IP]
command7:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-122-appupdate-backup-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-122-appupdate-backup-s3.cfg
@@ -96,9 +96,7 @@ command6:
. utils.sh; install_apps_test_packages APP_ID
command7:
. utils.sh; run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup122_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup122_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup122_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [backup122_IP]
command8:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-123-appupdate-backup-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-123-appupdate-backup-s4.cfg
@@ -96,11 +96,7 @@ command6:
. utils.sh; install_apps_test_packages APP_ID
command7:
. utils.sh; run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup123_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup123_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup123_IP]:"/var/log/univention/{join,setup,listener}.log" .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup123_IP]:/var/log/univention/connector* .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[backup123_IP]:/var/log/samba/* .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results-samba [backup123_IP]
command8:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-124-appupdate-slave-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-124-appupdate-slave-s3.cfg
@@ -96,9 +96,7 @@ command6:
. utils.sh; install_apps_test_packages APP_ID
command7:
. utils.sh; run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave124_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave124_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave124_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [slave124_IP]
command8:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-125-appupdate-slave-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-125-appupdate-slave-s4.cfg
@@ -96,9 +96,7 @@ command6:
. utils.sh; install_apps_test_packages APP_ID
command7:
. utils.sh; run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave125_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave125_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave125_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [slave125_IP]
command8:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-126-appupdate-member-s3.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-126-appupdate-member-s3.cfg
@@ -96,9 +96,7 @@ command6:
. utils.sh; install_apps_test_packages APP_ID
command7:
. utils.sh; run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member126_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member126_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member126_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [member126_IP]
command8:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-127-appupdate-member-s4.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-127-appupdate-member-s4.cfg
@@ -96,9 +96,7 @@ command6:
. utils.sh; install_apps_test_packages APP_ID
command7:
. utils.sh; run_apptests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member127_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member127_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[member127_IP]:"/var/log/univention/{join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [member127_IP]
command8:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-221-admember-module-w2k8r2-english.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-221-admember-module-w2k8r2-english.cfg
@@ -61,9 +61,7 @@ command6:
. utils.sh; set_administrator_password_for_ucs_test "Univention@99"
command7:
. utils.sh; run_admember_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master221_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master221_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master221_IP]:"/var/log/univention/{management-*,join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master221_IP] "/var/log/univention/management-*.log"
command8:
. utils.sh; shutdown_windows_host [win2k8r2221_IP]
halt -p
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-222-admember-module-w2k8r2-english-other-join-user.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-222-admember-module-w2k8r2-english-other-join-user.cfg
@@ -63,9 +63,7 @@ command6:
. utils.sh; set_administrator_password_for_ucs_test "Univention@99"
command7:
. utils.sh; run_admember_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master222_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master222_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master222_IP]:"/var/log/univention/{management-*,join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master222_IP] "/var/log/univention/management-*.log"
command8:
. utils.sh; shutdown_windows_host [win2k8r2222_IP]
halt -p
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-223-admember-module-w2k12-german-slave.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-223-admember-module-w2k12-german-slave.cfg
@@ -99,9 +99,7 @@ command6:
command7:
. utils.sh; set_administrator_password_for_ucs_test "Univention@99"
. utils.sh; run_admember_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave223_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave223_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave223_IP]:"/var/log/univention/{management-*,join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master223_IP] "/var/log/univention/management-*.log"
command8:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-224-admember-module-w2k12-german-other-join-user.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-224-admember-module-w2k12-german-other-join-user.cfg
@@ -63,9 +63,7 @@ command6:
. utils.sh; set_administrator_password_for_ucs_test "Univention@99"
command7:
. utils.sh; run_admember_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master224_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master224_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master224_IP]:"/var/log/univention/{management-*,join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master224_IP] "/var/log/univention/management-*.log"
command8:
. utils.sh; shutdown_windows_host [win2k12224_IP]
halt -p
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-225-admember-module-w2k12r2-france.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-225-admember-module-w2k12r2-france.cfg
@@ -62,9 +62,7 @@ command6:
. utils.sh; set_administrator_password_for_ucs_test "Univention@99"
command7:
. utils.sh; run_admember_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master225_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master225_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master225_IP]:"/var/log/univention/{management-*,join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master225_IP] "/var/log/univention/management-*.log"
command8:
. utils.sh; shutdown_windows_host [win2k12r2225_IP] Administrateur
halt -p
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-226-admember-installation-w2k8r2-english-other-join-user.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-226-admember-installation-w2k8r2-english-other-join-user.cfg
@@ -65,9 +65,7 @@ command4:
. utils.sh; set_administrator_password_for_ucs_test "Univention@99"
command5:
. utils.sh; run_admember_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master226a_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master226a_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master226a_IP]:"/var/log/univention/{management-*,join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master226a_IP] "/var/log/univention/management-*.log"
command6:
. utils.sh; shutdown_windows_host [win2k8r226a2_IP]
halt -p
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-226-admember-installation-w2k8r2-english.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-226-admember-installation-w2k8r2-english.cfg
@@ -63,9 +63,7 @@ command4:
. utils.sh; set_administrator_password_for_ucs_test "Univention@99"
command5:
. utils.sh; run_admember_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master226_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master226_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master226_IP]:"/var/log/univention/{management-*,join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master226_IP] "/var/log/univention/management-*.log"
command6:
. utils.sh; shutdown_windows_host [win2k8r2226_IP]
halt -p
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-227-admember-installation-w2k12-german-slave.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-227-admember-installation-w2k12-german-slave.cfg
@@ -94,9 +94,7 @@ command3:
command4:
. utils.sh; set_administrator_password_for_ucs_test "Univention@99"
. utils.sh; run_admember_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave227_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave227_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[slave227_IP]:"/var/log/univention/{management-*,join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master227_IP] "/var/log/univention/management-*.log"
command5:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-228-admember-installation-w2k12-german-other-join-user.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-228-admember-installation-w2k12-german-other-join-user.cfg
@@ -65,9 +65,7 @@ command4:
. utils.sh; set_administrator_password_for_ucs_test "Univention@99"
command5:
. utils.sh; run_admember_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master228_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master228_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master228_IP]:"/var/log/univention/{management-*,join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master228_IP] "/var/log/univention/management-*.log"
command6:
. utils.sh; shutdown_windows_host [win2k12228_IP]
halt -p
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-229-admember-installation-w2k12r2-france.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/autotest-229-admember-installation-w2k12r2-france.cfg
@@ -64,9 +64,7 @@ command4:
. utils.sh; set_administrator_password_for_ucs_test "Univention@99"
command5:
. utils.sh; run_admember_tests
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master229_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master229_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master229_IP]:"/var/log/univention/{management-*,join,setup,listener}.log" .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results [master229_IP] "/var/log/univention/management-*.log"
command6:
. utils.sh; shutdown_windows_host [win2k12r2229_IP] Administrateur
halt -p
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/ucsschool-performance-30000.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/ucsschool-performance-30000.cfg
@@ -80,11 +80,7 @@ command7:
chmod +x /usr/share/ucs-school-import/hooks/user_create_post.d/primarygroup
command8:
. utils.sh; run_tests -r import30000
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master30_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master30_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master30_IP]:"/var/log/univention/{join,setup,listener}.log" .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master30_IP]:/var/log/univention/connector* .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master30_IP]:/var/log/samba/* .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results-samba [master30_IP]
command9:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/ucsschool-performance-500.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/ucsschool-performance-500.cfg
@@ -65,11 +65,7 @@ command6:
ucr set repository/online/unmaintained=no
command7:
. utils.sh; run_tests -r import500
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master30_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master30_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master30_IP]:"/var/log/univention/{join,setup,listener}.log" .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master30_IP]:/var/log/univention/connector* .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master30_IP]:/var/log/samba/* .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results-samba [master30_IP]
command8:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/ucsschool-performance-65000.cfg
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/ucsschool-performance-65000.cfg
@@ -76,11 +76,7 @@ command6:
/etc/init.d/slapd restart
command7:
. utils.sh; run_tests -r import65000
- LOCAL scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master65_IP]:ucs-test.log .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master65_IP]:test-reports .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master65_IP]:"/var/log/univention/{join,setup,listener}.log" .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master65_IP]:/var/log/univention/connector* .
- LOCAL scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@[master65_IP]:/var/log/samba/* .
+ LOCAL examples/jenkins/utils/utils-local.sh fetch-results-samba [master30_IP]
command8:
halt -p
files:
--- a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/utils/utils-local.sh
+++ a/branches/ucs-4.0/ucs-4.0-0/test/ucs-ec2-tools/examples/jenkins/utils/utils-local.sh
@@ -27,36 +27,46 @@
# /usr/share/common-licenses/AGPL-3; if not, see
# .
+_scp () {
+ scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"
+}
+
+fetch-results () {
+ local ADDR="$1" TARGETDIR=.
+ shift
+ set -- "$@" ucs-test.log -r test-reports "/var/log/univention/{join,setup,listener,updater}.log"
+ while [ $# -ge 1 ]
+ do
+ case "$1" in
+ -d) TARGETDIR="$1" ; mkdir -p "$TARGETDIR" ; shift 1 ;;
+ -r) _scp -r "root@${ADDR}:${2}" "$TARGETDIR" ; shift 2 ;;
+ -*) return 2 ;;
+ *) _scp "root@${ADDR}:${1}" "$TARGETDIR" ; shift 1 ;;
+ esac
+ done
+}
+
+fetch-results-samba () {
+ fetch-results "$@" "/var/log/univention/connector*" -r "/var/log/samba*"
+}
+
ucsschool-fetch-results () {
- # ucsschool-fetch-results
- local ADDR="$1"
- local TARGETDIR="$2"
- if [ -n "$TARGETDIR" ] ; then
- [ ! -d "$TARGETDIR" ] && mkdir -p "$TARGETDIR"
- else
- TARGETDIR="."
- fi
- scp -i ~/ec2/keys/tech.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@${ADDR}:ucs-test.log "$TARGETDIR"
- scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@${ADDR}:test-reports "$TARGETDIR"
- scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@${ADDR}:/var/log/univention/management* "$TARGETDIR"
- scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@${ADDR}:"/var/log/univention/{join,setup,listener}.log" "$TARGETDIR"
- scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@${ADDR}:/var/log/univention/connector* "$TARGETDIR"
- scp -i ~/ec2/keys/tech.pem -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@${ADDR}:/var/log/samba/* "$TARGETDIR"
+ # ucsschool-fetch-results []
+ fetch-results-samba -d "${2:-.}" "$1" "/var/log/univention/management*"
}
# === MAIN ===
-ACTION="$1"
-shift || exit 1
+ACTION="${1:-}"
+shift || :
case "$ACTION" in
- ucsschool-fetch-results)
- ucsschool-fetch-results "$@"
- ;;
- *)
- echo "Unknown action: $ACTION"
- ;;
+ "") ;;
+ fetch-results) fetch-results "$@" ;;
+ fetch-results-samba) fetch-results-samba "$@" ;;
+ ucsschool-fetch-results) ucsschool-fetch-results "$@" ;;
+ *) echo "Unknown action: $ACTION" ; exit 2 ;;
esac
# vim:set filetype=sh ts=4:
--