17949: add support for Debian Bullseye in our build scripts. Remove some

       configuration for older, no longer supported distributions.

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index 161a50406998f0d486aa721f429397a5993f5003..80f7c12c101ceb3910fdde2a17b793d4841069cb 100644 (file)
--- a/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-all: centos7/generated debian10/generated ubuntu1604/generated ubuntu1804/generated ubuntu2004/generated
+all: centos7/generated debian10/generated debian11/generated ubuntu1804/generated ubuntu2004/generated
 
 centos7/generated: common-generated-all
        test -d centos7/generated || mkdir centos7/generated
@@ -12,9 +12,9 @@ debian10/generated: common-generated-all
        test -d debian10/generated || mkdir debian10/generated
        cp -f -rlt debian10/generated common-generated/*
 
-ubuntu1604/generated: common-generated-all
-       test -d ubuntu1604/generated || mkdir ubuntu1604/generated
-       cp -f -rlt ubuntu1604/generated common-generated/*
+debian11/generated: common-generated-all
+       test -d debian11/generated || mkdir debian11/generated
+       cp -f -rlt debian11/generated common-generated/*
 
 ubuntu1804/generated: common-generated-all
        test -d ubuntu1804/generated || mkdir ubuntu1804/generated

diff --git a/build/package-build-dockerfiles/ubuntu1604/Dockerfile b/build/package-build-dockerfiles/debian11/Dockerfile
similarity index 78%
rename from build/package-build-dockerfiles/ubuntu1604/Dockerfile
rename to build/package-build-dockerfiles/debian11/Dockerfile
index 77df54dcbd11f45c31f062a0ee8bc10619bfc824..99effa3cca6c922b7a6f237b92bb895082b3ed46 100644 (file)
--- a/build/package-build-dockerfiles/ubuntu1604/Dockerfile
+++ b/build/package-build-dockerfiles/debian11/Dockerfile
@@ -2,13 +2,14 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-FROM ubuntu:xenial
+## dont use debian:11 here since the word 'bullseye' is used for rvm precompiled binaries
+FROM debian:bullseye
 MAINTAINER Arvados Package Maintainers <packaging@arvados.org>
 
 ENV DEBIAN_FRONTEND noninteractive
 
 # Install dependencies.
-RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python3 python-setuptools python3-setuptools python3-pip libcurl4-gnutls-dev libgnutls-dev curl git libattr1-dev libfuse-dev libpq-dev unzip tzdata python3-venv python3-dev libpam-dev
+RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python3 python3-setuptools python3-pip libcurl4-gnutls-dev curl git procps libattr1-dev libfuse-dev libgnutls28-dev libpq-dev unzip python3-venv python3-dev libpam-dev equivs
 
 # Install virtualenv
 RUN /usr/bin/pip3 install 'virtualenv<20'
@@ -21,6 +22,7 @@ RUN gpg --import --no-tty /tmp/mpapis.asc && \
     curl -L https://get.rvm.io | bash -s stable && \
     /usr/local/rvm/bin/rvm install 2.5 && \
     /usr/local/rvm/bin/rvm alias create default ruby-2.5 && \
+    echo "gem: --no-document" >> /etc/gemrc && \
     /usr/local/rvm/bin/rvm-exec default gem install bundler --version 2.2.19 && \
     /usr/local/rvm/bin/rvm-exec default gem install fpm --version 1.10.2
 
@@ -35,4 +37,4 @@ RUN ln -s /usr/local/node-v10.23.1-linux-x64/bin/* /usr/local/bin/
 RUN git clone --depth 1 git://git.arvados.org/arvados.git /tmp/arvados && cd /tmp/arvados/services/api && /usr/local/rvm/bin/rvm-exec default bundle && cd /tmp/arvados/apps/workbench && /usr/local/rvm/bin/rvm-exec default bundle
 
 ENV WORKSPACE /arvados
-CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "ubuntu1604"]
+CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "debian11"]

diff --git a/build/package-test-dockerfiles/Makefile b/build/package-test-dockerfiles/Makefile
index 227b74bbab35faa2f7c12fe939e03fc51d2487de..849decb9a5016bb2676ea4a9e0e92ba639edd6d9 100644 (file)
--- a/build/package-test-dockerfiles/Makefile
+++ b/build/package-test-dockerfiles/Makefile
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-all: centos7/generated debian10/generated ubuntu1604/generated ubuntu1804/generated ubuntu2004/generated
+all: centos7/generated debian10/generated debian11/generated ubuntu1804/generated ubuntu2004/generated
 
 centos7/generated: common-generated-all
        test -d centos7/generated || mkdir centos7/generated
@@ -12,9 +12,9 @@ debian10/generated: common-generated-all
        test -d debian10/generated || mkdir debian10/generated
        cp -f -rlt debian10/generated common-generated/*
 
-ubuntu1604/generated: common-generated-all
-       test -d ubuntu1604/generated || mkdir ubuntu1604/generated
-       cp -f -rlt ubuntu1604/generated common-generated/*
+debian11/generated: common-generated-all
+       test -d debian11/generated || mkdir debian11/generated
+       cp -f -rlt debian11/generated common-generated/*
 
 ubuntu1804/generated: common-generated-all
        test -d ubuntu1804/generated || mkdir ubuntu1804/generated

diff --git a/build/package-test-dockerfiles/ubuntu1604/Dockerfile b/build/package-test-dockerfiles/debian11/Dockerfile
similarity index 69%
rename from build/package-test-dockerfiles/ubuntu1604/Dockerfile
rename to build/package-test-dockerfiles/debian11/Dockerfile
index 0b03e412a120f22bcf999a8aa17ad077e01e4a5c..7cc543cf0d67619f7107d9dacd07497b06c07b41 100644 (file)
--- a/build/package-test-dockerfiles/ubuntu1604/Dockerfile
+++ b/build/package-test-dockerfiles/debian11/Dockerfile
@@ -2,14 +2,14 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-FROM ubuntu:xenial
+FROM debian:bullseye
 MAINTAINER Arvados Package Maintainers <packaging@arvados.org>
 
 ENV DEBIAN_FRONTEND noninteractive
 
 # Install dependencies
 RUN apt-get update && \
-    apt-get -y install --no-install-recommends curl ca-certificates
+    apt-get -y install --no-install-recommends curl ca-certificates gpg procps gpg-agent
 
 # Install RVM
 ADD generated/mpapis.asc /tmp/
@@ -19,14 +19,10 @@ RUN gpg --import --no-tty /tmp/mpapis.asc && \
     curl -L https://get.rvm.io | bash -s stable && \
     /usr/local/rvm/bin/rvm install 2.5 && \
     /usr/local/rvm/bin/rvm alias create default ruby-2.5 && \
+    echo "gem: --no-document" >> /etc/gemrc && \
     /usr/local/rvm/bin/rvm-exec default gem install bundler --version 2.2.19
 
 # udev daemon can't start in a container, so don't try.
 RUN mkdir -p /etc/udev/disabled
 
-RUN echo "deb file:///arvados/packages/ubuntu1604/ /" >>/etc/apt/sources.list
-
-# Add preferences file for the Arvados packages. This pins Arvados
-# packages at priority 501, so that older python dependency versions
-# are preferred in those cases where we need them
-ADD etc-apt-preferences.d-arvados /etc/apt/preferences.d/arvados
+RUN echo "deb file:///arvados/packages/debian11/ /" >>/etc/apt/sources.list

diff --git a/build/package-test-dockerfiles/ubuntu1604/etc-apt-preferences.d-arvados b/build/package-test-dockerfiles/ubuntu1604/etc-apt-preferences.d-arvados
deleted file mode 100644 (file)
index 9e24695..0000000
--- a/build/package-test-dockerfiles/ubuntu1604/etc-apt-preferences.d-arvados
+++ /dev/null
@@ -1,3 +0,0 @@
-Package: *
-Pin: release o=Arvados
-Pin-Priority: 501

diff --git a/build/package-testing/test-packages-debian8.sh b/build/package-testing/test-packages-debian11.sh
similarity index 100%
rename from build/package-testing/test-packages-debian8.sh
rename to build/package-testing/test-packages-debian11.sh

diff --git a/build/package-testing/test-packages-debian9.sh b/build/package-testing/test-packages-debian9.sh
deleted file mode 120000 (symlink)
index 54ce94c..0000000
--- a/build/package-testing/test-packages-debian9.sh
+++ /dev/null
@@ -1 +0,0 @@
-deb-common-test-packages.sh
\ No newline at end of file

diff --git a/build/package-testing/test-packages-ubuntu1404.sh b/build/package-testing/test-packages-ubuntu1404.sh
deleted file mode 120000 (symlink)
index 54ce94c..0000000
--- a/build/package-testing/test-packages-ubuntu1404.sh
+++ /dev/null
@@ -1 +0,0 @@
-deb-common-test-packages.sh
\ No newline at end of file

diff --git a/build/package-testing/test-packages-ubuntu1604.sh b/build/package-testing/test-packages-ubuntu1604.sh
deleted file mode 120000 (symlink)
index 54ce94c..0000000
--- a/build/package-testing/test-packages-ubuntu1604.sh
+++ /dev/null
@@ -1 +0,0 @@
-deb-common-test-packages.sh
\ No newline at end of file

diff --git a/build/run-library.sh b/build/run-library.sh
index 0c3cbde8d86cafdba972d0f45cd245033b49a3b4..37a3d4b513794397c83b94686acc2cb79c7309cd 100755 (executable)
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -337,7 +337,7 @@ test_package_presence() {
     elif [[ "$FORMAT" == "deb" ]]; then
       declare -A dd
       dd[debian10]=buster
-      dd[ubuntu1604]=xenial
+      dd[debian11]=bullseye
       dd[ubuntu1804]=bionic
       dd[ubuntu2004]=focal
       D=${dd[$TARGET]}