From 92961c7e92b0345c0b2d55b78712617287c80557 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Thu, 17 Sep 2020 15:07:18 +0200
Subject: [PATCH] CI: proper 2nd server workspace
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/Jenkinsfile-GitLab-Docker | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/ci-scripts/Jenkinsfile-GitLab-Docker b/ci-scripts/Jenkinsfile-GitLab-Docker
index e9aa37a8..64b72864 100644
--- a/ci-scripts/Jenkinsfile-GitLab-Docker
+++ b/ci-scripts/Jenkinsfile-GitLab-Docker
@@ -150,9 +150,11 @@ pipeline {
echo "Upstream Job passed SMF_BRANCH to use: ${smfBranch}"
}
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"
if (new_host_flag) {
// 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('mkdir -p archives DS-TEST-RESULTS', new_host_flag, new_host_user, new_host)
}
@@ -246,19 +248,28 @@ pipeline {
def copyTo2ndServer(filename, flag, user, host) {
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) {
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) {
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 {
sh "${cmd}"
}
@@ -274,7 +285,7 @@ def myShCmdWithLog(cmd, logFile, flag, user, host) {
def myShRetCmd(cmd, flag, user, host) {
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 {
ret = sh returnStdout: true, script: "${cmd}"
}
--
GitLab