From: Ward Vandewege Date: Tue, 22 Dec 2020 19:52:26 +0000 (-0500) Subject: We've made a change in the structure of our apt repositories. X-Git-Tag: 2.2.0~179^2 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/40500de7ecb33a0f2197b2fe2449e6fc14b835a4 We've made a change in the structure of our apt repositories. refs #17218 Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- diff --git a/build/run-library.sh b/build/run-library.sh index 6f95a8f4bf..17ad557d81 100755 --- a/build/run-library.sh +++ b/build/run-library.sh @@ -347,11 +347,11 @@ test_package_presence() { repo_subdir=${pkgname:0:1} fi - repo_pkg_list=$(curl -s -o - http://apt.arvados.org/pool/${D}-dev/main/${repo_subdir}/${pkgname}/) + repo_pkg_list=$(curl -s -o - http://apt.arvados.org/${D}/pool/${D}-dev/main/${repo_subdir}/${pkgname}/) echo "${repo_pkg_list}" |grep -q ${full_pkgname} if [ $? -eq 0 ] ; then echo "Package $full_pkgname exists upstream, not rebuilding, downloading instead!" - curl -s -o "$WORKSPACE/packages/$TARGET/${full_pkgname}" http://apt.arvados.org/pool/${D}-dev/main/${repo_subdir}/${pkgname}/${full_pkgname} + curl -s -o "$WORKSPACE/packages/$TARGET/${full_pkgname}" http://apt.arvados.org/${D}/pool/${D}-dev/main/${repo_subdir}/${pkgname}/${full_pkgname} return 1 elif test -f "$WORKSPACE/packages/$TARGET/processed/${full_pkgname}" ; then echo "Package $full_pkgname exists, not rebuilding!" diff --git a/doc/install/packages.html.textile.liquid b/doc/install/packages.html.textile.liquid index cb7102bb37..81866507be 100644 --- a/doc/install/packages.html.textile.liquid +++ b/doc/install/packages.html.textile.liquid @@ -41,9 +41,9 @@ As root, add the Arvados package repository to your sources. This command depen table(table table-bordered table-condensed). |_. OS version|_. Command| -|Debian 10 ("buster")|echo "deb http://apt.arvados.org/ buster main" | tee /etc/apt/sources.list.d/arvados.list| -|Ubuntu 18.04 ("bionic")[1]|echo "deb http://apt.arvados.org/ bionic main" | tee /etc/apt/sources.list.d/arvados.list| -|Ubuntu 16.04 ("xenial")[1]|echo "deb http://apt.arvados.org/ xenial main" | tee /etc/apt/sources.list.d/arvados.list| +|Debian 10 ("buster")|echo "deb http://apt.arvados.org/buster buster main" | tee /etc/apt/sources.list.d/arvados.list| +|Ubuntu 18.04 ("bionic")[1]|echo "deb http://apt.arvados.org/bionic bionic main" | tee /etc/apt/sources.list.d/arvados.list| +|Ubuntu 16.04 ("xenial")[1]|echo "deb http://apt.arvados.org/xenial xenial main" | tee /etc/apt/sources.list.d/arvados.list| {% include 'notebox_begin' %} diff --git a/docker/jobs/apt.arvados.org-dev.list b/docker/jobs/apt.arvados.org-dev.list index 4de87397bc..210f5d5511 100644 --- a/docker/jobs/apt.arvados.org-dev.list +++ b/docker/jobs/apt.arvados.org-dev.list @@ -1,2 +1,2 @@ # apt.arvados.org -deb http://apt.arvados.org/ buster-dev main +deb http://apt.arvados.org/buster buster-dev main diff --git a/docker/jobs/apt.arvados.org-stable.list b/docker/jobs/apt.arvados.org-stable.list index 7882afd01c..153e729805 100644 --- a/docker/jobs/apt.arvados.org-stable.list +++ b/docker/jobs/apt.arvados.org-stable.list @@ -1,2 +1,2 @@ # apt.arvados.org -deb http://apt.arvados.org/ buster main +deb http://apt.arvados.org/buster buster main diff --git a/docker/jobs/apt.arvados.org-testing.list b/docker/jobs/apt.arvados.org-testing.list index 3bb599087e..d5f4581685 100644 --- a/docker/jobs/apt.arvados.org-testing.list +++ b/docker/jobs/apt.arvados.org-testing.list @@ -1,2 +1,2 @@ # apt.arvados.org -deb http://apt.arvados.org/ buster-testing main +deb http://apt.arvados.org/buster buster-testing main diff --git a/docker/migrate-docker19/Dockerfile b/docker/migrate-docker19/Dockerfile index a515ec45cb..23bb63547b 100644 --- a/docker/migrate-docker19/Dockerfile +++ b/docker/migrate-docker19/Dockerfile @@ -14,7 +14,7 @@ RUN apt-key adv --keyserver pool.sks-keyservers.net --recv 1078ECD7 && \ VOLUME /var/lib/docker RUN mkdir -p /etc/apt/sources.list.d && \ - echo deb http://apt.arvados.org/ jessie main > /etc/apt/sources.list.d/apt.arvados.org.list && \ + echo deb http://apt.arvados.org/jessie jessie main > /etc/apt/sources.list.d/apt.arvados.org.list && \ apt-get clean && \ apt-get update && \ apt-get install -yq --no-install-recommends -o Acquire::Retries=6 \ diff --git a/services/fuse/README.rst b/services/fuse/README.rst index d91ae05a11..25f1cda3b2 100644 --- a/services/fuse/README.rst +++ b/services/fuse/README.rst @@ -38,7 +38,7 @@ Installing on Debian systems 1. Add this Arvados repository to your sources list:: - deb http://apt.arvados.org/ jessie main + deb http://apt.arvados.org/buster buster main 2. Update your package list. diff --git a/tools/compute-images/scripts/base.sh b/tools/compute-images/scripts/base.sh index 73c7b9dac0..78cbccdb98 100644 --- a/tools/compute-images/scripts/base.sh +++ b/tools/compute-images/scripts/base.sh @@ -29,7 +29,7 @@ LSB_RELEASE_CODENAME=${TMP_LSB//[$'\t\r\n ']} # Add the arvados apt repository echo "# apt.arvados.org" |$SUDO tee --append /etc/apt/sources.list.d/apt.arvados.org.list -echo "deb http://apt.arvados.org/ $LSB_RELEASE_CODENAME${REPOSUFFIX} main" |$SUDO tee --append /etc/apt/sources.list.d/apt.arvados.org.list +echo "deb http://apt.arvados.org/$LSB_RELEASE_CODENAME $LSB_RELEASE_CODENAME${REPOSUFFIX} main" |$SUDO tee --append /etc/apt/sources.list.d/apt.arvados.org.list # Add the arvados signing key cat /tmp/1078ECD7.asc | $SUDO apt-key add -