From bc97d806fa1fb15e49cefe819f00089ebc33d376 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Wed, 22 Aug 2018 08:40:41 -0400 Subject: [PATCH] Add support for package testing to our ubuntu 18.04 packages. refs #13823 Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- build/package-test-dockerfiles/ubuntu1804/Dockerfile | 10 +++++----- build/package-testing/test-packages-ubuntu1804.sh | 1 + build/run-library.sh | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) create mode 120000 build/package-testing/test-packages-ubuntu1804.sh diff --git a/build/package-test-dockerfiles/ubuntu1804/Dockerfile b/build/package-test-dockerfiles/ubuntu1804/Dockerfile index 4825dedfd1..506abac11b 100644 --- a/build/package-test-dockerfiles/ubuntu1804/Dockerfile +++ b/build/package-test-dockerfiles/ubuntu1804/Dockerfile @@ -2,15 +2,15 @@ # # SPDX-License-Identifier: AGPL-3.0 -FROM ubuntu:xenial -MAINTAINER Ward Vandewege +FROM ubuntu:bionic +MAINTAINER Ward Vandewege ENV DEBIAN_FRONTEND noninteractive # Install RVM RUN apt-get update && \ - apt-get -y install --no-install-recommends curl ca-certificates && \ - gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \ + apt-get -y install --no-install-recommends curl ca-certificates gnupg2 && \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys D39DC0E3 && \ curl -L https://get.rvm.io | bash -s stable && \ /usr/local/rvm/bin/rvm install 2.3 && \ /usr/local/rvm/bin/rvm alias create default ruby-2.3 @@ -18,7 +18,7 @@ RUN apt-get update && \ # udev daemon can't start in a container, so don't try. RUN mkdir -p /etc/udev/disabled -RUN echo "deb file:///arvados/packages/ubuntu1804/ /" >>/etc/apt/sources.list +RUN echo "deb [trusted=yes] file:///arvados/packages/ubuntu1804/ /" >>/etc/apt/sources.list # Add preferences file for the Arvados packages. This pins Arvados # packages at priority 501, so that older python dependency versions diff --git a/build/package-testing/test-packages-ubuntu1804.sh b/build/package-testing/test-packages-ubuntu1804.sh new file mode 120000 index 0000000000..54ce94c357 --- /dev/null +++ b/build/package-testing/test-packages-ubuntu1804.sh @@ -0,0 +1 @@ +deb-common-test-packages.sh \ No newline at end of file diff --git a/build/run-library.sh b/build/run-library.sh index 46e4887a10..8ba14949d3 100755 --- a/build/run-library.sh +++ b/build/run-library.sh @@ -266,7 +266,7 @@ test_package_presence() { # Get the list of packages from the repos if [[ "$FORMAT" == "deb" ]]; then - debian_distros="jessie precise stretch trusty wheezy xenial" + debian_distros="jessie precise stretch trusty wheezy xenial bionic" for D in ${debian_distros}; do if [ ${pkgname:0:3} = "lib" ]; then -- 2.30.2