[ARVADOS] updated: 1.2.0-48-gbc97d806f

[Git user]

Summary of changes:
 build/package-test-dockerfiles/ubuntu1804/Dockerfile           | 10 +++++-----
 build/package-testing/deb-common-test-packages.sh              |  2 +-
 .../{test-packages-debian8.sh => test-packages-ubuntu1804.sh}  |  0
 build/run-library.sh                                           |  2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 copy build/package-testing/{test-packages-debian8.sh => test-packages-ubuntu1804.sh} (100%)

       via  bc97d806fa1fb15e49cefe819f00089ebc33d376 (commit)
       via  301e4dc1069fd7f97d977d9cbeb682e697660e49 (commit)
      from  e4fca76d5db9bd844530454894d07ddc729b4a9a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit bc97d806fa1fb15e49cefe819f00089ebc33d376
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Wed Aug 22 08:40:41 2018 -0400

    Add support for package testing to our ubuntu 18.04 packages.
    
    refs #13823
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>

diff --git a/build/package-test-dockerfiles/ubuntu1804/Dockerfile b/build/package-test-dockerfiles/ubuntu1804/Dockerfile
index 4825dedfd..506abac11 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 <ward at curoverse.com>
+FROM ubuntu:bionic
+MAINTAINER Ward Vandewege <wvandewege at veritasgenetics.com>
 
 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 000000000..54ce94c35
--- /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 46e4887a1..8ba14949d 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

commit 301e4dc1069fd7f97d977d9cbeb682e697660e49
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Wed Aug 22 08:38:34 2018 -0400

    Remove spurious error output in package testing script.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>

diff --git a/build/package-testing/deb-common-test-packages.sh b/build/package-testing/deb-common-test-packages.sh
index 900b09195..b5325224e 100755
--- a/build/package-testing/deb-common-test-packages.sh
+++ b/build/package-testing/deb-common-test-packages.sh
@@ -27,7 +27,7 @@ cd /tmp/opts
 
 export ARV_PACKAGES_DIR="/arvados/packages/$target"
 
-if [[ -f $(ls -t "$ARV_PACKAGES_DIR/$1"_*.deb | head -n1) ]] ; then
+if [[ -f $(ls -t "$ARV_PACKAGES_DIR/$1"_*.deb 2>/dev/null | head -n1) ]] ; then
     debpkg=$(ls -t "$ARV_PACKAGES_DIR/$1"_*.deb | head -n1)
 else
     debpkg=$(ls -t "$ARV_PACKAGES_DIR/processed/$1"_*.deb | head -n1)

-----------------------------------------------------------------------


hooks/post-receive
--