From a349e3edf67dd33c4aed579715d1b061e6338d73 Mon Sep 17 00:00:00 2001 From: Jeremy Mordkoff Date: Thu, 8 Sep 2016 09:07:07 -0400 Subject: [PATCH] use fedora for now Signed-off-by: Jeremy Mordkoff --- jenkins/SO/SETTINGS | 2 +- jenkins/UI/SETTINGS | 6 ++++-- jenkins/UI/start_build | 5 ++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/jenkins/SO/SETTINGS b/jenkins/SO/SETTINGS index 786feb68..f54455c7 100644 --- a/jenkins/SO/SETTINGS +++ b/jenkins/SO/SETTINGS @@ -17,7 +17,7 @@ # 24 June 2016 -- Jeremy Mordkoff -- Genesis # # this variable holds the name of the container image needed to build or run this product -export OSM_BASE_IMAGE=ubuntu:16.04 +export OSM_BASE_IMAGE=fedora:20 # # this variable holds the name of the container to be used to build a package # if this container already exists, the build process can skip the container build diff --git a/jenkins/UI/SETTINGS b/jenkins/UI/SETTINGS index c79217f5..50bbb4ee 100644 --- a/jenkins/UI/SETTINGS +++ b/jenkins/UI/SETTINGS @@ -17,11 +17,13 @@ # 24 June 2016 -- Jeremy Mordkoff -- Genesis # # this variable holds the name of the container image needed to build or run this product -export OSM_BASE_IMAGE=ubuntu:16.04 +export OSM_BASE_IMAGE=fedora:20 # # this variable holds the name of the container to be used to build a package # if this container already exists, the build process can skip the container build -export OSM_BUILD_CONTAINER=UI-build +# +# THis is not a typo .. I want to use the same container as SO for now +export OSM_BUILD_CONTAINER=SO-build # # this variable must be set to allow creating the build container in privileged mode # this variable should be removed in the future when no privileged mode is required diff --git a/jenkins/UI/start_build b/jenkins/UI/start_build index 5a54d2da..05a191c3 100755 --- a/jenkins/UI/start_build +++ b/jenkins/UI/start_build @@ -39,9 +39,8 @@ else fi INFO "starting build" -### for start_build -### put your commands here to -### build, test and produce coverage reports +make -j16 -C UI || FATAL "Make failed" +sudo make install || FATAL "Make install Failed" RC=0 -- 2.25.1