Enable Debian-11 (bullseye) support

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 950b17fb8672697d223d303e9b5cd66d8af7b61a..2d6bc2dc7073a578f224d22059d29fbf0ece4253 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -130,123 +130,103 @@ rubocop:
 
 workbench-ubuntu-2004-tiamat-py3: {extends: .test_instance}
 # workbench-ubuntu-2004-master-py3: {extends: .test_instance}
-# workbench-ubuntu-2004-3003-1-py3: {extends: .test_instance}
-# workbench-ubuntu-2004-3002-6-py3: {extends: .test_instance}
-# workbench-ubuntu-2004-3001-7-py3: {extends: .test_instance}
+# workbench-ubuntu-2004-3003.3-py3: {extends: .test_instance}
+# workbench-ubuntu-2004-3002.7-py3: {extends: .test_instance}
+# workbench-ubuntu-2004-3001.8-py3: {extends: .test_instance}
 # workbench-ubuntu-1804-tiamat-py3: {extends: .test_instance}
 workbench-ubuntu-1804-master-py3: {extends: .test_instance}
-# workbench-ubuntu-1804-3003-1-py3: {extends: .test_instance}
-# workbench-ubuntu-1804-3002-6-py3: {extends: .test_instance}
-# workbench-ubuntu-1804-3001-7-py3: {extends: .test_instance}
-# workbench-ubuntu-1804-3000-9-py3: {extends: .test_instance}
-# workbench-ubuntu-1804-3000-9-py2: {extends: .test_instance}
+# workbench-ubuntu-1804-3003.3-py3: {extends: .test_instance}
+# workbench-ubuntu-1804-3002.7-py3: {extends: .test_instance}
+# workbench-ubuntu-1804-3001.8-py3: {extends: .test_instance}
 # workbench-debian-11-tiamat-py3: {extends: .test_instance}
 # workbench-debian-11-master-py3: {extends: .test_instance}
-# Not supported by nginx/passenger repos
-# workbench-debian-11-3003-1-py3: {extends: .test_instance}
-# workbench-debian-11-3002-6-py3: {extends: .test_instance}
+workbench-debian-11-3003.3-py3: {extends: .test_instance}
+# workbench-debian-11-3002.7-py3: {extends: .test_instance}
 # workbench-debian-10-tiamat-py3: {extends: .test_instance}
 # workbench-debian-10-master-py3: {extends: .test_instance}
-# workbench-debian-10-3003-1-py3: {extends: .test_instance}
-workbench-debian-10-3002-6-py3: {extends: .test_instance}
-# workbench-debian-10-3001-7-py3: {extends: .test_instance}
-# workbench-debian-10-3000-9-py3: {extends: .test_instance}
+# workbench-debian-10-3003.3-py3: {extends: .test_instance}
+workbench-debian-10-3002.7-py3: {extends: .test_instance}
+# workbench-debian-10-3001.8-py3: {extends: .test_instance}
 # workbench-centos-7-tiamat-py3: {extends: .test_instance}
 # workbench-centos-7-master-py3: {extends: .test_instance}
-# workbench-centos-7-3003-1-py3: {extends: .test_instance}
-# workbench-centos-7-3002-6-py3: {extends: .test_instance}
-workbench-centos-7-3001-7-py3: {extends: .test_instance}
-# workbench-centos-7-3000-9-py3: {extends: .test_instance}
+# workbench-centos-7-3003.3-py3: {extends: .test_instance}
+# workbench-centos-7-3002.7-py3: {extends: .test_instance}
+workbench-centos-7-3001.8-py3: {extends: .test_instance}
 
 # shell-ubuntu-2004-tiamat-py3: {extends: .test_instance}
 shell-ubuntu-2004-master-py3: {extends: .test_instance}
-# shell-ubuntu-2004-3003-1-py3: {extends: .test_instance}
-# shell-ubuntu-2004-3002-6-py3: {extends: .test_instance}
-# shell-ubuntu-2004-3001-7-py3: {extends: .test_instance}
+# shell-ubuntu-2004-3003.3-py3: {extends: .test_instance}
+# shell-ubuntu-2004-3002.7-py3: {extends: .test_instance}
+# shell-ubuntu-2004-3001.8-py3: {extends: .test_instance}
 # shell-ubuntu-1804-tiamat-py3: {extends: .test_instance}
 # shell-ubuntu-1804-master-py3: {extends: .test_instance}
-shell-ubuntu-1804-3003-1-py3: {extends: .test_instance}
-# shell-ubuntu-1804-3002-6-py3: {extends: .test_instance}
-# shell-ubuntu-1804-3001-7-py3: {extends: .test_instance}
-# shell-ubuntu-1804-3000-9-py3: {extends: .test_instance}
-# shell-ubuntu-1804-3000-9-py2: {extends: .test_instance}
+shell-ubuntu-1804-3003.3-py3: {extends: .test_instance}
+# shell-ubuntu-1804-3002.7-py3: {extends: .test_instance}
+# shell-ubuntu-1804-3001.8-py3: {extends: .test_instance}
 # shell-debian-11-tiamat-py3: {extends: .test_instance}
 # shell-debian-11-master-py3: {extends: .test_instance}
-# shell-debian-11-3003-1-py3: {extends: .test_instance}
-# Not supported by nginx/passenger repos
-# shell-debian-11-3002-6-py3: {extends: .test_instance}
+# shell-debian-11-3003.3-py3: {extends: .test_instance}
+shell-debian-11-3002.7-py3: {extends: .test_instance}
 # shell-debian-10-tiamat-py3: {extends: .test_instance}
 # shell-debian-10-master-py3: {extends: .test_instance}
-# shell-debian-10-3003-1-py3: {extends: .test_instance}
-# shell-debian-10-3002-6-py3: {extends: .test_instance}
-shell-debian-10-3001-7-py3: {extends: .test_instance}
-# shell-debian-10-3000-9-py3: {extends: .test_instance}
+# shell-debian-10-3003.3-py3: {extends: .test_instance}
+# shell-debian-10-3002.7-py3: {extends: .test_instance}
+shell-debian-10-3001.8-py3: {extends: .test_instance}
 shell-centos-7-tiamat-py3: {extends: .test_instance}
 # shell-centos-7-master-py3: {extends: .test_instance}
-# shell-centos-7-3003-1-py3: {extends: .test_instance}
-# shell-centos-7-3002-6-py3: {extends: .test_instance}
-# shell-centos-7-3001-7-py3: {extends: .test_instance}
-# shell-centos-7-3000-9-py3: {extends: .test_instance}
+# shell-centos-7-3003.3-py3: {extends: .test_instance}
+# shell-centos-7-3002.7-py3: {extends: .test_instance}
+# shell-centos-7-3001.8-py3: {extends: .test_instance}
 
 # keepstore-ubuntu-2004-tiamat-py3: {extends: .test_instance}
 # keepstore-ubuntu-2004-master-py3: {extends: .test_instance}
-keepstore-ubuntu-2004-3003-1-py3: {extends: .test_instance}
-# keepstore-ubuntu-2004-3002-6-py3: {extends: .test_instance}
-# keepstore-ubuntu-2004-3001-7-py3: {extends: .test_instance}
+keepstore-ubuntu-2004-3003.3-py3: {extends: .test_instance}
+# keepstore-ubuntu-2004-3002.7-py3: {extends: .test_instance}
+# keepstore-ubuntu-2004-3001.8-py3: {extends: .test_instance}
 # keepstore-ubuntu-1804-tiamat-py3: {extends: .test_instance}
 # keepstore-ubuntu-1804-master-py3: {extends: .test_instance}
-# keepstore-ubuntu-1804-3003-1-py3: {extends: .test_instance}
-keepstore-ubuntu-1804-3002-6-py3: {extends: .test_instance}
-# keepstore-ubuntu-1804-3001-7-py3: {extends: .test_instance}
-# keepstore-ubuntu-1804-3000-9-py3: {extends: .test_instance}
-# keepstore-ubuntu-1804-3000-9-py2: {extends: .test_instance}
-# Not supported by nginx/passenger repos
-# keepstore-debian-11-tiamat-py3: {extends: .test_instance}
+# keepstore-ubuntu-1804-3003.3-py3: {extends: .test_instance}
+keepstore-ubuntu-1804-3002.7-py3: {extends: .test_instance}
+# keepstore-ubuntu-1804-3001.8-py3: {extends: .test_instance}
+keepstore-debian-11-tiamat-py3: {extends: .test_instance}
 # keepstore-debian-11-master-py3: {extends: .test_instance}
-# keepstore-debian-11-3003-1-py3: {extends: .test_instance}
-# keepstore-debian-11-3002-6-py3: {extends: .test_instance}
+# keepstore-debian-11-3003.3-py3: {extends: .test_instance}
+# keepstore-debian-11-3002.7-py3: {extends: .test_instance}
 # keepstore-debian-10-tiamat-py3: {extends: .test_instance}
 # keepstore-debian-10-master-py3: {extends: .test_instance}
-# keepstore-debian-10-3003-1-py3: {extends: .test_instance}
-# keepstore-debian-10-3002-6-py3: {extends: .test_instance}
-keepstore-debian-10-3001-7-py3: {extends: .test_instance}
-# keepstore-debian-10-3000-9-py3: {extends: .test_instance}
+# keepstore-debian-10-3003.3-py3: {extends: .test_instance}
+# keepstore-debian-10-3002.7-py3: {extends: .test_instance}
+keepstore-debian-10-3001.8-py3: {extends: .test_instance}
 # keepstore-centos-7-tiamat-py3: {extends: .test_instance}
 # keepstore-centos-7-master-py3: {extends: .test_instance}
-# keepstore-centos-7-3003-1-py3: {extends: .test_instance}
-# keepstore-centos-7-3002-6-py3: {extends: .test_instance}
-# keepstore-centos-7-3001-7-py3: {extends: .test_instance}
-keepstore-centos-7-3000-9-py3: {extends: .test_instance}
+# keepstore-centos-7-3003.3-py3: {extends: .test_instance}
+# keepstore-centos-7-3002.7-py3: {extends: .test_instance}
+# keepstore-centos-7-3001.8-py3: {extends: .test_instance}
 
 # api-ubuntu-2004-tiamat-py3: {extends: .test_instance}
 # api-ubuntu-2004-master-py3: {extends: .test_instance}
-# api-ubuntu-2004-3003-1-py3: {extends: .test_instance}
-api-ubuntu-2004-3002-6-py3: {extends: .test_instance}
-# api-ubuntu-2004-3001-7-py3: {extends: .test_instance}
+# api-ubuntu-2004-3003.3-py3: {extends: .test_instance}
+api-ubuntu-2004-3002.7-py3: {extends: .test_instance}
+# api-ubuntu-2004-3001.8-py3: {extends: .test_instance}
 # api-ubuntu-1804-tiamat-py3: {extends: .test_instance}
 # api-ubuntu-1804-master-py3: {extends: .test_instance}
-# api-ubuntu-1804-3003-1-py3: {extends: .test_instance}
-# api-ubuntu-1804-3002-6-py3: {extends: .test_instance}
-api-ubuntu-1804-3001-7-py3: {extends: .test_instance}
-# api-ubuntu-1804-3000-9-py3: {extends: .test_instance}
-# api-ubuntu-1804-3000-9-py2: {extends: .test_instance}
+# api-ubuntu-1804-3003.3-py3: {extends: .test_instance}
+# api-ubuntu-1804-3002.7-py3: {extends: .test_instance}
+api-ubuntu-1804-3001.8-py3: {extends: .test_instance}
 # api-debian-11-tiamat-py3: {extends: .test_instance}
 # api-debian-11-master-py3: {extends: .test_instance}
-# Not supported by nginx/passenger repos
-# api-debian-11-3003-1-py3: {extends: .test_instance}
-# api-debian-11-3002-6-py3: {extends: .test_instance}
+api-debian-11-3003.3-py3: {extends: .test_instance}
+# api-debian-11-3002.7-py3: {extends: .test_instance}
 # api-debian-10-tiamat-py3: {extends: .test_instance}
 # api-debian-10-master-py3: {extends: .test_instance}
-# api-debian-10-3003-1-py3: {extends: .test_instance}
-# api-debian-10-3002-6-py3: {extends: .test_instance}
-# api-debian-10-3001-7-py3: {extends: .test_instance}
-api-debian-10-3000-9-py3: {extends: .test_instance}
+# api-debian-10-3003.3-py3: {extends: .test_instance}
+# api-debian-10-3002.7-py3: {extends: .test_instance}
+# api-debian-10-3001.8-py3: {extends: .test_instance}
 api-centos-7-tiamat-py3: {extends: .test_instance}
 # api-centos-7-master-py3: {extends: .test_instance}
-# api-centos-7-3003-1-py3: {extends: .test_instance}
-# api-centos-7-3002-6-py3: {extends: .test_instance}
-# api-centos-7-3001-7-py3: {extends: .test_instance}
-# api-centos-7-3000-9-py3: {extends: .test_instance}
+# api-centos-7-3003.3-py3: {extends: .test_instance}
+# api-centos-7-3002.7-py3: {extends: .test_instance}
+# api-centos-7-3001.8-py3: {extends: .test_instance}
 
 ###############################################################################
 # `release` stage: `semantic-release`

diff --git a/kitchen.yml b/kitchen.yml
index 4e38bb836199412efcaaf6e1383300140594c921..5e707293a7aa62f0183db79bb7579415d607e53e 100644 (file)
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -57,67 +57,53 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:centos-7
 
-  ## SALT `3003.1`
-  - name: debian-11-3003-1-py3
+  ## SALT `3003.3`
+  - name: debian-11-3003.3-py3
     driver:
-      image: saltimages/salt-3003.1-py3:debian-11
-  - name: debian-10-3003-1-py3
+      image: saltimages/salt-3003.3-py3:debian-11
+  - name: debian-10-3003.3-py3
     driver:
-      image: saltimages/salt-3003.1-py3:debian-10
-  - name: ubuntu-2004-3003-1-py3
+      image: saltimages/salt-3003.3-py3:debian-10
+  - name: ubuntu-2004-3003.3-py3
     driver:
-      image: saltimages/salt-3003.1-py3:ubuntu-20.04
-  - name: ubuntu-1804-3003-1-py3
+      image: saltimages/salt-3003.3-py3:ubuntu-20.04
+  - name: ubuntu-1804-3003.3-py3
     driver:
-      image: saltimages/salt-3003.1-py3:ubuntu-18.04
-  - name: centos-7-3003-1-py3
+      image: saltimages/salt-3003.3-py3:ubuntu-18.04
+  - name: centos-7-3003.3-py3
     driver:
-      image: saltimages/salt-3003.1-py3:centos-7
+      image: saltimages/salt-3003.3-py3:centos-7
 
-  ## SALT `3002.6`
-  - name: debian-11-3002-6-py3
+  ## SALT `3002.7`
+  - name: debian-11-3002.7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:debian-11
-  - name: debian-10-3002-6-py3
+      image: saltimages/salt-3002.7-py3:debian-11
+  - name: debian-10-3002.7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:debian-10
-  - name: ubuntu-2004-3002-6-py3
+      image: saltimages/salt-3002.7-py3:debian-10
+  - name: ubuntu-2004-3002.7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:ubuntu-20.04
-  - name: ubuntu-1804-3002-6-py3
+      image: saltimages/salt-3002.7-py3:ubuntu-20.04
+  - name: ubuntu-1804-3002.7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:ubuntu-18.04
-  - name: centos-7-3002-6-py3
+      image: saltimages/salt-3002.7-py3:ubuntu-18.04
+  - name: centos-7-3002.7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:centos-7
+      image: saltimages/salt-3002.7-py3:centos-7
 
-  ## SALT `3001.7`
-  - name: debian-10-3001-7-py3
+  ## SALT `3001.8`
+  - name: debian-10-3001.8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:debian-10
-  - name: ubuntu-2004-3001-7-py3
+      image: saltimages/salt-3001.8-py3:debian-10
+  - name: ubuntu-2004-3001.8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:ubuntu-20.04
-  - name: ubuntu-1804-3001-7-py3
+      image: saltimages/salt-3001.8-py3:ubuntu-20.04
+  - name: ubuntu-1804-3001.8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:ubuntu-18.04
-  - name: centos-7-3001-7-py3
+      image: saltimages/salt-3001.8-py3:ubuntu-18.04
+  - name: centos-7-3001.8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:centos-7
-
-  ## SALT `3000.9`
-  - name: debian-10-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:debian-10
-  - name: ubuntu-1804-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:ubuntu-18.04
-  - name: centos-7-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:centos-7
-  - name: ubuntu-1804-3000-9-py2
-    driver:
-      image: saltimages/salt-3000.9-py2:ubuntu-18.04
+      image: saltimages/salt-3001.8-py3:centos-7
 
 verifier:
   # https://www.inspec.io/