fix(apt): update repository URL

refs https://dev.arvados.org/issues/17218

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

diff --git a/arvados/repo/install.sls b/arvados/repo/install.sls
index 1146f30e5f2d004171923edb84232f9725182a03..41df68bbad873d0d0c6b925e76dcfd8975a477d9 100644 (file)
--- a/arvados/repo/install.sls
+++ b/arvados/repo/install.sls
@@ -17,7 +17,7 @@
 arvados-repo-install-pkgrepo-managed:
   pkgrepo.managed:
     - humanname: {{ arvados.repo.humanname }}
-    - name: deb {{ arvados.repo.url_base }}/ {{ release }} main
+    - name: deb {{ arvados.repo.url_base }}/{{ release }} {{ release }} main
     - file: {{ arvados.repo.file }}
     - key_url: {{ arvados.repo.key_url }}
 

diff --git a/test/integration/repo/controls/repo_spec.rb b/test/integration/repo/controls/repo_spec.rb
index 33caf8f7e9bee9992145579de151aa8eae255e37..c3f581fd8b6ba05365e45e4a1648fd62603ca9f3 100644 (file)
--- a/test/integration/repo/controls/repo_spec.rb
+++ b/test/integration/repo/controls/repo_spec.rb
@@ -6,7 +6,7 @@ when 'centos'
   repo_url = 'baseurl=http://rpm.arvados.org/CentOS/$releasever/os/$basearch/'
 when 'debian', 'ubuntu'
   repo_file = '/etc/apt/sources.list.d/arvados.list'
-  repo_url = 'deb http://apt.arvados.org buster main'
+  repo_url = 'deb http://apt.arvados.org/buster buster main'
 end
 
 control 'arvados repository' do

diff --git a/test/integration/shell/controls/repo_spec.rb b/test/integration/shell/controls/repo_spec.rb
index 528b82fd21a128948b062fd9b14b2d8436c29523..20f1c4a215e4550271081e83e150f6ee8a308cd3 100644 (file)
--- a/test/integration/shell/controls/repo_spec.rb
+++ b/test/integration/shell/controls/repo_spec.rb
@@ -6,7 +6,7 @@ when 'centos'
   repo_url = 'baseurl=http://rpm.arvados.org/CentOS/$releasever/dev/$basearch/'
 when 'debian', 'ubuntu'
   repo_file = '/etc/apt/sources.list.d/arvados.list'
-  repo_url = 'deb http://apt.arvados.org buster-dev main'
+  repo_url = 'deb http://apt.arvados.org/buster buster-dev main'
 end
 
 control 'arvados repository' do