Merge pull request #71 from grycap/devel

Devel

.github/workflows/main.yaml

@@ -18,9 +18,9 @@ jobs:
       matrix:
         distro:
           - centos8
-          - centos7
+          - rockylinux9
           - ubuntu2004
-          - ubuntu1804
+          - ubuntu2204
 
     steps:
       - name: Check out the codebase.
@@ -49,10 +49,9 @@ jobs:
       matrix:
         distro:
           - centos8
-          - centos7
-          - ubuntu2204
+          - rockylinux9
           - ubuntu2004
-          - ubuntu1804
+          - ubuntu2204
 
     steps:
       - name: Check out the codebase.

molecule/default/converge.yml

@@ -5,6 +5,7 @@
   vars: 
     ansible_python_interpreter: /usr/bin/python
     nvidia_driver_skip_reboot: yes
+    docker_compose_version: v2.23.2
   tasks:
     - name: Link python
       raw: ls /usr/bin/python || { ls /usr/bin/python2 && ln -s /usr/bin/python2 /usr/bin/python; } || { ls /usr/bin/python3 && ln -s /usr/bin/python3 /usr/bin/python; }
@@ -65,3 +66,13 @@
         that:
           - "'containerd.runtimes.nvidia' in slurpfile['content'] | b64decode"
       when: ansible_os_family == "Debian" and lookup('env','CONTAINERD') == "1"
+
+    - command: docker-compose -v
+      changed_when: false
+      register: docker_compose_v
+      when: lookup('env','CONTAINERD') == "0"
+
+    - assert:
+        that:
+          - "docker_compose_version[1:] in docker_compose_v.stdout"
+      when: lookup('env','CONTAINERD') == "0"

tasks/docker.yml

@@ -144,7 +144,11 @@
       creates: /usr/bin/pip
 
   - name: Install dependencies for docker management pip3
-    pip: name=docker,docker-compose executable=pip3
+    pip:
+      name:
+      - docker<7.0.0  # Fix version to avoid errors in ansible docker_compose module
+      - docker-compose
+      executable: pip3
     when: ansible_python.version.major > 2
 
   - name: Remove docker-compose v1 bin