From 9f299e77e627bb0684cda7058b57f812b28f46fd Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Thu, 28 Jun 2018 14:16:50 +0200
Subject: [PATCH] CI: hotfix -- Corrected the long option version for variant
in test run script -- added proper test in zip command in pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/Jenkinsfile-gitlab | 2 +-
ci-scripts/runTestOnVM.sh | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab
index e80324e3f1b..099329843b1 100644
--- a/ci-scripts/Jenkinsfile-gitlab
+++ b/ci-scripts/Jenkinsfile-gitlab
@@ -171,7 +171,7 @@ pipeline {
always {
script {
dir ('archives') {
- sh "zip -r -qq vm_tests_logs.zip */test"
+ sh "if [ -d */test ]; then zip -r -qq vm_tests_logs.zip */test ; fi"
}
if(fileExists('archives/vm_tests_logs.zip')) {
archiveArtifacts artifacts: 'archives/vm_tests_logs.zip'
diff --git a/ci-scripts/runTestOnVM.sh b/ci-scripts/runTestOnVM.sh
index e679d790df8..56ea35a5f29 100755
--- a/ci-scripts/runTestOnVM.sh
+++ b/ci-scripts/runTestOnVM.sh
@@ -133,6 +133,8 @@ case $key in
;;
phy-sim)
VM_NAME=ci-phy-sim
+ RUN_OPTIONS="./run_exec_autotests.bash -g \"01510*\" -q -np -b"
+ ARCHIVES_LOC=phy_sim/test
;;
cppcheck)
VM_NAME=ci-cppcheck
--
GitLab