switch SO and UI from fedora to Ubuntu

Signed-off-by: Jeremy Mordkoff <jeremy.mordkoff@riftio.com>

diff --git a/jenkins/SO/SETTINGS b/jenkins/SO/SETTINGS
index f54455c..995e01d 100644 (file)
--- a/jenkins/SO/SETTINGS
+++ b/jenkins/SO/SETTINGS
@@ -17,11 +17,11 @@
 # 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=fedora:20
+export OSM_BASE_IMAGE=ubuntu:16.04
 #
 # 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=SO-build
+export OSM_BUILD_CONTAINER=SO-ub
 #
 # 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
@@ -29,7 +29,7 @@ export OSM_BUILD_CONTAINER=SO-build
 #
 # this variable holds the name of the container to be used to run a package
 # if this container already exists, the run processes can skip the container build
-export OSM_RUNTIME_CONTAINER=SO-runtime
+export OSM_RUNTIME_CONTAINER=SO-ub
 #
 # this variable must be set to allow creating the runtime container in privileged mode
 # this variable should be removed in the future when no privileged mode is required

diff --git a/jenkins/SO/start_build b/jenkins/SO/start_build
index ac07fc7..fa1e1c4 100755 (executable)
--- a/jenkins/SO/start_build
+++ b/jenkins/SO/start_build
@@ -49,7 +49,7 @@ fi
 
 INFO "starting build"
 make clean || FATAL "make clean failed"
-./BUILD.sh
+./BUILD_UB.sh
 
 RC=$?
 

diff --git a/jenkins/UI/SETTINGS b/jenkins/UI/SETTINGS
index 50bbb4e..995e01d 100644 (file)
--- a/jenkins/UI/SETTINGS
+++ b/jenkins/UI/SETTINGS
@@ -17,13 +17,11 @@
 # 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=fedora:20
+export OSM_BASE_IMAGE=ubuntu:16.04
 #
 # 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
-# 
-# THis is not a typo .. I want to use the same container as SO for now
-export OSM_BUILD_CONTAINER=SO-build
+export OSM_BUILD_CONTAINER=SO-ub
 #
 # 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
@@ -31,7 +29,7 @@ export OSM_BUILD_CONTAINER=SO-build
 #
 # this variable holds the name of the container to be used to run a package
 # if this container already exists, the run processes can skip the container build
-export OSM_RUNTIME_CONTAINER=UI-runtime
+export OSM_RUNTIME_CONTAINER=SO-ub
 #
 # this variable must be set to allow creating the runtime container in privileged mode
 # this variable should be removed in the future when no privileged mode is required