From 5a6a88bd1e4831128c55f72923b18f5f771d45f2 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 04 May 2009 16:12:57 +0000
Subject: [PATCH] New functionality to run tests (functional and stress) on a remote machine
---
opends/tests/staf-tests/shared/functions/webcontainer.xml | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/webcontainer.xml b/opends/tests/staf-tests/shared/functions/webcontainer.xml
index eed4bd4..104c05e 100755
--- a/opends/tests/staf-tests/shared/functions/webcontainer.xml
+++ b/opends/tests/staf-tests/shared/functions/webcontainer.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Portions Copyright 2008 Sun Microsystems, Inc.
+ ! Portions Copyright 2008-2009 Sun Microsystems, Inc.
! -->
<stax>
@@ -101,19 +101,12 @@
</process>
<!-- generate SSL certificate -->
- <stafcmd>
- <location>STAXServiceMachine</location>
- <service>'var'</service>
- <request>'resolve string {STAF/Config/STAFRoot}'</request>
- </stafcmd>
-
- <script>stafRoot=STAFResult</script>
<!-- Check if 'tomcatCertificate' file exists -->
<call function="'GetEntry'">
{
'location' : STAXServiceMachine,
- 'entry' : '%s/services/DSML/tomcatCertificate' % stafRoot,
+ 'entry' : '%s/services/DSML/tomcatCertificate' % LOCAL_STAF_ROOT,
'attribute' : 'TYPE'
}
</call>
@@ -127,7 +120,7 @@
-dname "cn=tomcat,O=Sun Microsystems,C=US" \
-keystore "%s/services/DSML/tomcatCertificate" \
-storepass "changeit" -keypass "changeit" \
- -storetype JKS ' % (stafRoot),
+ -storetype JKS ' % (LOCAL_STAF_ROOT),
'path' : '%s/bin' % (LOCAL_JAVA_HOME),
'expectedRC': 0
}
@@ -136,7 +129,7 @@
<call function="'copyFile'">
{ 'location' : STAXServiceMachine,
- 'srcfile' : '%s/services/DSML/tomcatCertificate' % (stafRoot),
+ 'srcfile' : '%s/services/DSML/tomcatCertificate' % (LOCAL_STAF_ROOT),
'destfile' : '%s/%s-%s/conf/tomcatCertificate' % (wcPath, WC_TYPE, WC_VERSION),
'remotehost' : mylocation
}
--
Gitblit v1.10.0