diff --git a/jenkins/SO/SETTINGS b/jenkins/SO/SETTINGS index 786feb689be1edcc2353b80bedc733728d08cc14..f54455c77a747cd10be8949d0fade8971a019fa9 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 c79217f564846506f3eed57bb94c3ca75b5c7d7a..50bbb4ee4901e4014ba1f9a4c71243094c05f451 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 5a54d2da9f2208581acc2e30cd840047f0b70423..05a191c329516a3efedb14c08615bf078dd22bd5 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