From: Jeremy Mordkoff <jeremy.mordkoff@gmail.com>
Date: Mon, 2 Oct 2017 22:11:23 +0000 (-0400)
Subject: mkcontainer complains unless rift.list exists
X-Git-Tag: v3.0.0rc2~4
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=2b22e63a1ce60d7c62535eece0e62280b1e00445;p=osm%2Fdevops.git

mkcontainer complains unless rift.list exists

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

diff --git a/jenkins/SO/install b/jenkins/SO/install
index 7ca6b901..59cfae1d 100755
--- a/jenkins/SO/install
+++ b/jenkins/SO/install
@@ -80,7 +80,7 @@ function usage() {
 
 # enable the right repos
 curl http://repos.riftio.com/public/xenial-riftware-public-key | apt-key add -
-curl -o /etc/apt/sources.list.d/RIFT.list http://buildtracker.riftio.com/repo_file/ub16/${PLATFORM_REPOSITORY}/
+curl -o /etc/apt/sources.list.d/rift.list http://buildtracker.riftio.com/repo_file/ub16/${PLATFORM_REPOSITORY}/
 
 # Make the Rift repo a higher priority to work around version conflicts.
 cat <<EOF > /etc/apt/preferences.d/rift
@@ -98,7 +98,7 @@ apt-get install -y --allow-downgrades rw.tools-container-tools=${PLATFORM_VERSIO
 
 # now disable the RIFT OSM repo so that we'll get MANO from
 # the OSM repos
-rm -f /etc/apt/sources.list.d/RIFT.list
+rm -f /etc/apt/sources.list.d/rift.list
 
 apt-get update
 
diff --git a/jenkins/UI/install b/jenkins/UI/install
index c8c5be1e..45eb5ca4 100755
--- a/jenkins/UI/install
+++ b/jenkins/UI/install
@@ -82,7 +82,7 @@ function usage() {
 
 # enable the right repos
 curl http://repos.riftio.com/public/xenial-riftware-public-key | apt-key add -
-curl -o /etc/apt/sources.list.d/RIFT.list http://buildtracker.riftio.com/repo_file/ub16/${PLATFORM_REPOSITORY}/
+curl -o /etc/apt/sources.list.d/rift.list http://buildtracker.riftio.com/repo_file/ub16/${PLATFORM_REPOSITORY}/
 
 # Make the Rift repo a higher priority to work around version conflicts.
 cat <<EOF > /etc/apt/preferences.d/rift
@@ -101,7 +101,6 @@ apt-get install -y --allow-downgrades rw.tools-container-tools=${PLATFORM_VERSIO
 
 # now disable the RIFT OSM repo so that we'll get UI from
 # the OSM repos
-rm -f /etc/apt/sources.list.d/RIFT.list
 
 apt-get update
 apt-get install -y rw.ui-skyquake