diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab index d4edd583b45c4ddec8018aa73bbfd57378dc12b6..2a29742c36a5aea6458e062499a46caf54a96139 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 3d660c46101cc04204661dac35b98884746230cb..c8ff90c11e33eff71da478af3a9d9d0039442240 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 4722c30c15badf13b1a45f146c902d6cf875a4a8..02d9523d676c033bc55c54e2c2d5a7fc662f98ed 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