From 94adb87ea33c7805a4ad4fc071c7035d8b512742 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Wed, 22 Sep 2021 17:46:22 +0200
Subject: [PATCH] CI/CD enhancements

---
 .jenkins.sh               | 14 +++++++++++++-
 scripts/docker/Dockerfile |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.jenkins.sh b/.jenkins.sh
index 22ed7fcf..8bfd08f3 100644
--- a/.jenkins.sh
+++ b/.jenkins.sh
@@ -12,7 +12,18 @@ run_dir="$(pwd)"
 echo "Using git branch $GIT_BRANCH"
 
 bash ./scripts/build-container.sh
-bash ./scripts/run-container.sh "${run_dir}" "$GIT_BRANCH"
+ret=$?
+if [ "$ret" != "0" ]; then
+     echo "build-container.sh failed"
+     exit -1
+fi
+
+bash ./scripts/run-container.sh "${run_dir}"
+ret=$?
+if [ "$ret" != "0" ]; then
+     echo "run-container.sh failed"
+     exit -1
+fi
 
 if [[ "$GIT_BRANCH" =~ .*fix-plu$ ]]; then
 
@@ -30,3 +41,4 @@ fi
 ret=$?
 echo "Final validation result: $ret"
 exit $ret
+
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index bf5f1801..9f082157 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 MAINTAINER ETSI STF 583
 
-- 
GitLab