Skip to content
Snippets Groups Projects
Commit 92961c7e authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files

CI: proper 2nd server workspace

parent e1dd34b6
No related branches found
No related tags found
No related merge requests found
...@@ -150,9 +150,11 @@ pipeline { ...@@ -150,9 +150,11 @@ pipeline {
echo "Upstream Job passed SMF_BRANCH to use: ${smfBranch}" echo "Upstream Job passed SMF_BRANCH to use: ${smfBranch}"
} }
sh "git clean -x -d -f > /dev/null 2>&1" sh "git clean -x -d -f > /dev/null 2>&1"
sh "zip -r oai-cn5g-fed.zip .git"
sh "mkdir -p archives DS-TEST-RESULTS" sh "mkdir -p archives DS-TEST-RESULTS"
if (new_host_flag) { if (new_host_flag) {
// Prepare the workspace in remote server // Prepare the workspace in remote server
copyTo2ndServer('oai-cn5g-fed.zip', new_host_flag, new_host_user, new_host)
myShCmd('git clean -x -d -f > /dev/null 2>&1', new_host_flag, new_host_user, new_host) myShCmd('git clean -x -d -f > /dev/null 2>&1', new_host_flag, new_host_user, new_host)
myShCmd('mkdir -p archives DS-TEST-RESULTS', new_host_flag, new_host_user, new_host) myShCmd('mkdir -p archives DS-TEST-RESULTS', new_host_flag, new_host_user, new_host)
} }
...@@ -246,19 +248,28 @@ pipeline { ...@@ -246,19 +248,28 @@ pipeline {
def copyTo2ndServer(filename, flag, user, host) { def copyTo2ndServer(filename, flag, user, host) {
if (flag) { if (flag) {
sh "scp ${filename} ${user}@${host}:/tmp/CI-CN-FED" if ("oai-cn5g-fed.zip".equals(filename)) {
sh "ssh ${user}@${host} 'rm -rf /tmp/CI-CN5G-FED'"
sh "ssh ${user}@${host} 'mkdir -p /tmp/CI-CN5G-FED'"
}
sh "scp ${filename} ${user}@${host}:/tmp/CI-CN5G-FED"
if ("oai-cn5g-fed.zip".equals(filename)) {
sh "ssh ${user}@${host} 'unzip oai-cn5g-fed.zip && rm oai-cn5g-fed.zip'"
sh "ssh ${user}@${host} 'git checkout -f ${GIT_COMMIT}'"
sh "ssh ${user}@${host} 'git log -n1'"
}
} }
} }
def copyFrom2ndServer(filename, target, flag, user, host) { def copyFrom2ndServer(filename, target, flag, user, host) {
if (flag) { if (flag) {
sh "scp ${user}@${host}:/tmp/CI-CN-FED/${filename} ${target}" sh "scp ${user}@${host}:/tmp/CI-CN5G-FED/${filename} ${target}"
} }
} }
def myShCmd(cmd, flag, user, host) { def myShCmd(cmd, flag, user, host) {
if (flag) { if (flag) {
sh "ssh -t -t ${user}@${host} 'cd /tmp/CI-CN-FED && ${cmd}'" sh "ssh -t -t ${user}@${host} 'cd /tmp/CI-CN5G-FED && ${cmd}'"
} else { } else {
sh "${cmd}" sh "${cmd}"
} }
...@@ -274,7 +285,7 @@ def myShCmdWithLog(cmd, logFile, flag, user, host) { ...@@ -274,7 +285,7 @@ def myShCmdWithLog(cmd, logFile, flag, user, host) {
def myShRetCmd(cmd, flag, user, host) { def myShRetCmd(cmd, flag, user, host) {
if (flag) { if (flag) {
ret = sh returnStdout: true, script: "ssh -t -t ${user}@${host} 'cd /tmp/CI-CN-FED && ${cmd}'" ret = sh returnStdout: true, script: "ssh -t -t ${user}@${host} 'cd /tmp/CI-CN5G-FED && ${cmd}'"
} else { } else {
ret = sh returnStdout: true, script: "${cmd}" ret = sh returnStdout: true, script: "${cmd}"
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment