From 23ce820aad666f5ad897ffe106f8b5f7e4baac33 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Thu, 29 Jul 2021 16:13:54 -0400 Subject: [PATCH] More cleanup, remove references to Ubuntu 16.04 (xenial) which is no longer supported. No issue # Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- cmd/arvados-server/arvados-controller.service | 3 --- cmd/arvados-server/arvados-dispatch-cloud.service | 3 --- cmd/arvados-server/arvados-dispatch-lsf.service | 3 --- cmd/arvados-server/arvados-ws.service | 3 --- doc/_includes/_install_ruby_and_bundler.liquid | 2 -- sdk/cwl/fpm-info.sh | 3 --- services/arv-git-httpd/arvados-git-httpd.service | 3 --- services/crunch-dispatch-local/crunch-dispatch-local.service | 3 --- services/crunch-dispatch-slurm/crunch-dispatch-slurm.service | 3 --- services/dockercleaner/arvados-docker-cleaner.service | 3 --- services/dockercleaner/fpm-info.sh | 3 --- services/health/arvados-health.service | 3 --- services/keep-balance/keep-balance.service | 3 --- services/keep-web/keep-web.service | 3 --- services/keepproxy/keepproxy.service | 3 --- services/keepstore/keepstore.service | 3 --- 16 files changed, 47 deletions(-) diff --git a/cmd/arvados-server/arvados-controller.service b/cmd/arvados-server/arvados-controller.service index 1a43d7cd3a..420cbb035a 100644 --- a/cmd/arvados-server/arvados-controller.service +++ b/cmd/arvados-server/arvados-controller.service @@ -8,9 +8,6 @@ Documentation=https://doc.arvados.org/ After=network.target AssertPathExists=/etc/arvados/config.yml -# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section -StartLimitInterval=0 - # systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section StartLimitIntervalSec=0 diff --git a/cmd/arvados-server/arvados-dispatch-cloud.service b/cmd/arvados-server/arvados-dispatch-cloud.service index d3f476b7df..8d57e8a161 100644 --- a/cmd/arvados-server/arvados-dispatch-cloud.service +++ b/cmd/arvados-server/arvados-dispatch-cloud.service @@ -8,9 +8,6 @@ Documentation=https://doc.arvados.org/ After=network.target AssertPathExists=/etc/arvados/config.yml -# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section -StartLimitInterval=0 - # systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section StartLimitIntervalSec=0 diff --git a/cmd/arvados-server/arvados-dispatch-lsf.service b/cmd/arvados-server/arvados-dispatch-lsf.service index f9e73a2c79..65d8786670 100644 --- a/cmd/arvados-server/arvados-dispatch-lsf.service +++ b/cmd/arvados-server/arvados-dispatch-lsf.service @@ -8,9 +8,6 @@ Documentation=https://doc.arvados.org/ After=network.target AssertPathExists=/etc/arvados/config.yml -# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section -StartLimitInterval=0 - # systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section StartLimitIntervalSec=0 diff --git a/cmd/arvados-server/arvados-ws.service b/cmd/arvados-server/arvados-ws.service index aebc56a79f..f73db5d080 100644 --- a/cmd/arvados-server/arvados-ws.service +++ b/cmd/arvados-server/arvados-ws.service @@ -8,9 +8,6 @@ Documentation=https://doc.arvados.org/ After=network.target AssertPathExists=/etc/arvados/config.yml -# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section -StartLimitInterval=0 - # systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section StartLimitIntervalSec=0 diff --git a/doc/_includes/_install_ruby_and_bundler.liquid b/doc/_includes/_install_ruby_and_bundler.liquid index 387f023f24..fe7714c62f 100644 --- a/doc/_includes/_install_ruby_and_bundler.liquid +++ b/doc/_includes/_install_ruby_and_bundler.liquid @@ -22,8 +22,6 @@ The Ruby version shipped with Centos 7 is too old. Use "RVM":#rvm to install Ru h3. Debian and Ubuntu -Ubuntu 16.04 (xenial) ships with Ruby 2.3, which is not supported by Arvados. Use "RVM":#rvm to install Ruby 2.5 or later. - Debian 10 (buster) and Ubuntu 18.04 (bionic) and later ship with Ruby 2.5, which is supported by Arvados. diff --git a/sdk/cwl/fpm-info.sh b/sdk/cwl/fpm-info.sh index 9a52ee7021..5c17a2fd14 100644 --- a/sdk/cwl/fpm-info.sh +++ b/sdk/cwl/fpm-info.sh @@ -5,9 +5,6 @@ fpm_depends+=(nodejs) case "$TARGET" in - ubuntu1604) - fpm_depends+=(libcurl3-gnutls) - ;; debian* | ubuntu*) fpm_depends+=(libcurl3-gnutls python3-distutils) ;; diff --git a/services/arv-git-httpd/arvados-git-httpd.service b/services/arv-git-httpd/arvados-git-httpd.service index 7ac160eea3..6c2b3bc58d 100644 --- a/services/arv-git-httpd/arvados-git-httpd.service +++ b/services/arv-git-httpd/arvados-git-httpd.service @@ -7,9 +7,6 @@ Description=Arvados git server Documentation=https://doc.arvados.org/ After=network.target -# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section -StartLimitInterval=0 - # systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section StartLimitIntervalSec=0 diff --git a/services/crunch-dispatch-local/crunch-dispatch-local.service b/services/crunch-dispatch-local/crunch-dispatch-local.service index 692d81e570..e3dd113c71 100644 --- a/services/crunch-dispatch-local/crunch-dispatch-local.service +++ b/services/crunch-dispatch-local/crunch-dispatch-local.service @@ -6,9 +6,6 @@ Description=Arvados Crunch Dispatcher for LOCAL service Documentation=https://doc.arvados.org/ After=network.target -# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section -StartLimitInterval=0 - # systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section StartLimitIntervalSec=0 diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.service b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.service index 2af56c8d0c..86830f3a7f 100644 --- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.service +++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.service @@ -7,9 +7,6 @@ Description=Arvados Crunch Dispatcher for SLURM Documentation=https://doc.arvados.org/ After=network.target -# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section -StartLimitInterval=0 - # systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section StartLimitIntervalSec=0 diff --git a/services/dockercleaner/arvados-docker-cleaner.service b/services/dockercleaner/arvados-docker-cleaner.service index 7e049144ae..2aab42b2a3 100644 --- a/services/dockercleaner/arvados-docker-cleaner.service +++ b/services/dockercleaner/arvados-docker-cleaner.service @@ -7,9 +7,6 @@ Description=Arvados Docker Image Cleaner Documentation=https://doc.arvados.org/ After=network.target -# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section -StartLimitInterval=0 - # systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section StartLimitIntervalSec=0 diff --git a/services/dockercleaner/fpm-info.sh b/services/dockercleaner/fpm-info.sh index ccb7a467af..3158043303 100644 --- a/services/dockercleaner/fpm-info.sh +++ b/services/dockercleaner/fpm-info.sh @@ -3,9 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 case "$TARGET" in - ubuntu1604) - fpm_depends+=() - ;; debian* | ubuntu*) fpm_depends+=(python3-distutils) ;; diff --git a/services/health/arvados-health.service b/services/health/arvados-health.service index ca3744c28d..4b8745d154 100644 --- a/services/health/arvados-health.service +++ b/services/health/arvados-health.service @@ -8,9 +8,6 @@ Documentation=https://doc.arvados.org/ After=network.target AssertPathExists=/etc/arvados/config.yml -# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section -StartLimitInterval=0 - # systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section StartLimitIntervalSec=0 diff --git a/services/keep-balance/keep-balance.service b/services/keep-balance/keep-balance.service index 0a38597e6c..859d707241 100644 --- a/services/keep-balance/keep-balance.service +++ b/services/keep-balance/keep-balance.service @@ -7,9 +7,6 @@ Description=Arvados Keep Balance Documentation=https://doc.arvados.org/ After=network.target -# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section -StartLimitInterval=0 - # systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section StartLimitIntervalSec=0 diff --git a/services/keep-web/keep-web.service b/services/keep-web/keep-web.service index 8097822777..cb5fdf84fc 100644 --- a/services/keep-web/keep-web.service +++ b/services/keep-web/keep-web.service @@ -7,9 +7,6 @@ Description=Arvados Keep web gateway Documentation=https://doc.arvados.org/ After=network.target -# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section -StartLimitInterval=0 - # systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section StartLimitIntervalSec=0 diff --git a/services/keepproxy/keepproxy.service b/services/keepproxy/keepproxy.service index 4c63161a0d..9548cb219b 100644 --- a/services/keepproxy/keepproxy.service +++ b/services/keepproxy/keepproxy.service @@ -7,9 +7,6 @@ Description=Arvados Keep Proxy Documentation=https://doc.arvados.org/ After=network.target -# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section -StartLimitInterval=0 - # systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section StartLimitIntervalSec=0 diff --git a/services/keepstore/keepstore.service b/services/keepstore/keepstore.service index 7047f0e6b9..1f14c3f464 100644 --- a/services/keepstore/keepstore.service +++ b/services/keepstore/keepstore.service @@ -7,9 +7,6 @@ Description=Arvados Keep Storage Daemon Documentation=https://doc.arvados.org/ After=network.target -# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section -StartLimitInterval=0 - # systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section StartLimitIntervalSec=0 -- 2.30.2