From: Javier Bértoli <jbertoli@curii.com>
Date: Fri, 4 Mar 2022 12:37:05 +0000 (-0300)
Subject: 18761: move away from pkgrepo on Debian's family
X-Git-Url: https://git.arvados.org/arvados-formula.git/commitdiff_plain/41134d973164139471e442512e7acf7a6bf37977?hp=aadb0b65a2ccbad9aab366aa53fd8fc3c4f1b229

18761: move away from pkgrepo on Debian's family

Entries are being duplicated as described in

* https://github.com/saltstack/salt/issues/60220 and
* https://github.com/saltstack/salt/issues/59785#issuecomment-826590482

Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>
---

diff --git a/arvados/api/package/install.sls b/arvados/api/package/install.sls
index ce0004e..1c487a6 100644
--- a/arvados/api/package/install.sls
+++ b/arvados/api/package/install.sls
@@ -45,5 +45,6 @@ arvados-api-package-install-pkg-installed:
   pkg.installed:
     - name: {{ arvados.api.pkg.name }}
     - version: {{ arvados.version }}
+    - refresh: true
     - require:
       - sls: {{ sls_config_file }}
diff --git a/arvados/config/package/install.sls b/arvados/config/package/install.sls
index 031e3e8..31e4e30 100644
--- a/arvados/config/package/install.sls
+++ b/arvados/config/package/install.sls
@@ -9,3 +9,4 @@ arvados-config-package-install-pkg-installed:
   pkg.installed:
     - name: arvados-server
     - version: {{ arvados.version }}
+    - refresh: true
diff --git a/arvados/controller/package/install.sls b/arvados/controller/package/install.sls
index 62161ea..a820045 100644
--- a/arvados/controller/package/install.sls
+++ b/arvados/controller/package/install.sls
@@ -42,3 +42,4 @@ arvados-controller-package-install-pkg-installed:
   pkg.installed:
     - name: {{ arvados.controller.pkg.name }}
     - version: {{ arvados.version }}
+    - refresh: true
diff --git a/arvados/dispatcher/package/install.sls b/arvados/dispatcher/package/install.sls
index ec76dab..2073201 100644
--- a/arvados/dispatcher/package/install.sls
+++ b/arvados/dispatcher/package/install.sls
@@ -9,6 +9,7 @@ arvados-dispatcher-package-install-pkg-installed:
   pkg.installed:
     - name: {{ arvados.dispatcher.pkg.name }}
     - version: {{ arvados.version }}
+    - refresh: true
 
 # FIXME! Until https://dev.arvados.org/issues/16995 makes it to
 # a new release, this is required so the dependency is installed
@@ -16,7 +17,8 @@ arvados-dispatcher-package-install-pkg-installed:
 arvados-dispatcher-package-install-crunch-run-pkg-installed:
   pkg.installed:
     - name: crunch-run
+    - version: {{ arvados.version }}
+    - refresh: true
     - require:
       - pkg: arvados-dispatcher-package-install-pkg-installed
-    - version: {{ arvados.version }}
 {%- endif %}
diff --git a/arvados/init.sls b/arvados/init.sls
index 9836070..48ad786 100644
--- a/arvados/init.sls
+++ b/arvados/init.sls
@@ -15,3 +15,4 @@ include:
   - .shell
   - .workbench
   - .dispatcher
+  - .keepbalance
diff --git a/arvados/keepproxy/package/install.sls b/arvados/keepproxy/package/install.sls
index e06faa6..5176a7d 100644
--- a/arvados/keepproxy/package/install.sls
+++ b/arvados/keepproxy/package/install.sls
@@ -9,3 +9,4 @@ arvados-keepproxy-package-install-pkg-installed:
   pkg.installed:
     - name: {{ arvados.keepproxy.pkg.name }}
     - version: {{ arvados.version }}
+    - refresh: true
diff --git a/arvados/keepstore/package/install.sls b/arvados/keepstore/package/install.sls
index 9d311d5..38853a5 100644
--- a/arvados/keepstore/package/install.sls
+++ b/arvados/keepstore/package/install.sls
@@ -9,3 +9,4 @@ arvados-keepstore-package-install-pkg-installed:
   pkg.installed:
     - name: {{ arvados.keepstore.pkg.name }}
     - version: {{ arvados.version }}
+    - refresh: true
diff --git a/arvados/keepweb/package/install.sls b/arvados/keepweb/package/install.sls
index e9cfd4c..23144ee 100644
--- a/arvados/keepweb/package/install.sls
+++ b/arvados/keepweb/package/install.sls
@@ -9,3 +9,4 @@ arvados-keepweb-package-install-pkg-installed:
   pkg.installed:
     - name: {{ arvados.keepweb.pkg.name }}
     - version: {{ arvados.version }}
+    - refresh: true
diff --git a/arvados/repo/install.sls b/arvados/repo/install.sls
index c22bbbc..2c9360e 100644
--- a/arvados/repo/install.sls
+++ b/arvados/repo/install.sls
@@ -24,15 +24,14 @@ arvados-repo-install-pkgrepo-keyring-managed:
       - {{ arvados.repo.keyring_source }}
     - source_hash: sha256={{ arvados.repo.keyring_source_hash }}
     - require_in:
-      - pkgrepo: arvados-repo-install-pkgrepo-managed
+      - file: arvados-repo-install-file-managed
 
-arvados-repo-install-pkgrepo-managed:
-  pkgrepo.managed:
-    - humanname: {{ arvados.repo.humanname }}
-    - name: >-
+arvados-repo-install-file-managed:
+  file.managed:
+    - name: {{ arvados.repo.file }}
+    - contents: >
         deb [signed-by={{ arvados.repo.keyring_file }} arch=amd64]
         {{ arvados.repo.url_base }}/{{ distro }} {{ release }} main
-    - file: {{ arvados.repo.file }}
 
   {%- elif grains.get('os_family') == 'RedHat' %}
     {%- if arvados.release == 'testing' %}
diff --git a/arvados/shell/package/install.sls b/arvados/shell/package/install.sls
index 6d1300f..7a0698f 100644
--- a/arvados/shell/package/install.sls
+++ b/arvados/shell/package/install.sls
@@ -30,6 +30,7 @@ arvados-shell-package-install-pkg-installed:
       - {{ package }}
         {%- endif %}
       {%- endfor %}
+    - refresh: true
 
 arvados-shell-package-install-gems-deps-pkg-installed:
   pkg.installed:
diff --git a/arvados/websocket/package/install.sls b/arvados/websocket/package/install.sls
index fe8f87a..a1c4344 100644
--- a/arvados/websocket/package/install.sls
+++ b/arvados/websocket/package/install.sls
@@ -9,3 +9,4 @@ arvados-websocket-package-install-pkg-installed:
   pkg.installed:
     - name: {{ arvados.websocket.pkg.name }}
     - version: {{ arvados.version }}
+    - refresh: true
diff --git a/arvados/workbench/package/install.sls b/arvados/workbench/package/install.sls
index f379f64..0eb191e 100644
--- a/arvados/workbench/package/install.sls
+++ b/arvados/workbench/package/install.sls
@@ -29,6 +29,7 @@ arvados-workbench-package-install-pkg-installed:
   pkg.installed:
     - name: {{ arvados.workbench.pkg.name }}
     - version: {{ arvados.version }}
+    - refresh: true
     - require:
       {%- if arvados.ruby.manage_ruby %}
       - {{ ruby_dep }}: arvados-ruby-package-install-ruby-{{ ruby_dep }}-installed
diff --git a/arvados/workbench2/package/install.sls b/arvados/workbench2/package/install.sls
index 9e503ff..2ba21c0 100644
--- a/arvados/workbench2/package/install.sls
+++ b/arvados/workbench2/package/install.sls
@@ -10,5 +10,6 @@ arvados-workbench2-package-install-pkg-installed:
   pkg.installed:
     - name: {{ arvados.workbench2.pkg.name }}
     - version: {{ arvados.version }}
+    - refresh: true
     - require:
       - sls: {{ sls_config_file }}