fixing test jenkinsfiles for new jenkins server
Change-Id: I3c6cb73ac8f706749d09fb7c4f788ed06c8d2dd3
diff --git a/Jenkinsfile-ecord-global b/Jenkinsfile-ecord-global
index b3cb9d2..3215d61 100644
--- a/Jenkinsfile-ecord-global
+++ b/Jenkinsfile-ecord-global
@@ -15,16 +15,16 @@
pod_config = null
deployment_config = null
-node ('master') {
- stage ("Parse configuration file") {
+
+node ("${devNodeName}") {
+
+ stage ("Parse deployment configuration file") {
sh returnStdout: true, script: 'rm -rf ${configRepoBaseDir}'
sh returnStdout: true, script: 'git clone -b ${branch} ${configRepoUrl}'
deployment_config = readYaml file: "${configRepoBaseDir}${configRepoFile}"
pod_config = readYaml file: "${configRepoBaseDir}${deployment_config.pod_config.file_name}"
}
-}
-node ("${deployment_config.dev_node.name}") {
stage('Prerequisites') {
runHeadNodeCmd("""
cd /opt/cord/test/cord-tester/src/test/setup
@@ -38,7 +38,7 @@
export SERVER_IP=localhost
export SERVER_PORT=9101
export XOS_USER=xosadmin@opencord.org
- export XOS_PASSWD=\$(cat /opt/credentials/xosadmin@opencord.org)
+ export XOS_PASSWD=\\\$(cat /opt/credentials/xosadmin@opencord.org)
rm -rf ~/diag-*
cd /opt/cord/build; make collect-diag
cd /opt/cord/test/cord-tester/src/test/diag/
@@ -58,7 +58,7 @@
export SERVER_IP=localhost
export SERVER_PORT=9101
export XOS_USER=xosadmin@opencord.org
- export XOS_PASSWD=\$(cat /opt/credentials/xosadmin@opencord.org)
+ export XOS_PASSWD=\\\$(cat /opt/credentials/xosadmin@opencord.org)
""")
} catch(error) { currentBuild.result = 'FAILURE' }
}