From 2b22e63a1ce60d7c62535eece0e62280b1e00445 Mon Sep 17 00:00:00 2001 From: Jeremy Mordkoff Date: Mon, 2 Oct 2017 18:11:23 -0400 Subject: [PATCH] mkcontainer complains unless rift.list exists Signed-off-by: Jeremy Mordkoff --- jenkins/SO/install | 4 ++-- jenkins/UI/install | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) 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 < /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 < /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 -- 2.25.1