From c0e2a0105bc52f1845e33ff0f6a586fe4816fc1e Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Tue, 26 Jun 2018 17:00:57 +0200
Subject: [PATCH] CI: litte syntax / typos
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/Jenkinsfile-gitlab | 2 +-
ci-scripts/buildOnVM.sh | 5 +++--
ci-scripts/createVM.sh | 1 +
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab
index d4edd583b4..2a29742c36 100644
--- a/ci-scripts/Jenkinsfile-gitlab
+++ b/ci-scripts/Jenkinsfile-gitlab
@@ -8,7 +8,7 @@ pipeline {
disableConcurrentBuilds()
timestamps()
gitLabConnection('OAI GitLab')
- gitlabBuilds(builds: ["Build eNb-USRP", "Build basic-sim", "Build phy-sim", "Build eNb-ethernet", "Build UE--ethernet", "Analysis with cppcheck"])
+ gitlabBuilds(builds: ["Build eNb-USRP", "Build basic-sim", "Build phy-sim", "Build eNb-ethernet", "Build UE-ethernet", "Analysis with cppcheck"])
}
stages {
diff --git a/ci-scripts/buildOnVM.sh b/ci-scripts/buildOnVM.sh
index 3d660c4610..c8ff90c11e 100755
--- a/ci-scripts/buildOnVM.sh
+++ b/ci-scripts/buildOnVM.sh
@@ -248,10 +248,11 @@ then
echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base"
echo "############################################################"
uvt-kvm create $VM_NAME release=xenial --memory 2048 --cpu 4 --unsafe-caching --template ci-scripts/template-host.xml
- echo "Waiting for VM to be started"
- uvt-kvm wait $VM_NAME --insecure
fi
+echo "Waiting for VM to be started"
+uvt-kvm wait $VM_NAME --insecure
+
VM_IP_ADDR=`uvt-kvm ip $VM_NAME`
echo "$VM_NAME has for IP addr = $VM_IP_ADDR"
diff --git a/ci-scripts/createVM.sh b/ci-scripts/createVM.sh
index 4722c30c15..02d9523d67 100755
--- a/ci-scripts/createVM.sh
+++ b/ci-scripts/createVM.sh
@@ -114,6 +114,7 @@ case $key in
VM_NAME=ci-basic-sim
;;
phy-sim)
+ VM_NAME=ci-phy-sim
;;
cppcheck)
VM_NAME=ci-cppcheck
--
GitLab