Merge branch 'master' into rocky8

geerlingguy · Feb 14, 2023 · c63e69b · c63e69b
2 parents 0a8e211 + d6d2776
commit c63e69b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,15 +41,15 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: centos7
+          - distro: rockylinux8
             playbook: converge.yml
-          - distro: ubuntu1804
+          - distro: ubuntu2004
             playbook: converge.yml
-          - distro: debian9
+          - distro: debian10
             playbook: converge.yml
-          - distro: centos7
+          - distro: rockylinux8
             playbook: version.yml
-          - distro: ubuntu1804
+          - distro: ubuntu2004
             playbook: version.yml
           - distro: rockylinux8
             playbook: version.yml

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -9,7 +9,8 @@ platforms:
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
     privileged: true
     pre_build_image: true
 provisioner:

diff --git a/molecule/default/version.yml b/molecule/default/version.yml
@@ -19,7 +19,7 @@
 
     - name: Set the test GitLab version number for Debian.
       set_fact:
-        gitlab_version: '11.4.0-ce.0'
+        gitlab_version: '15.6.3-ce.0'
       when: ansible_os_family == 'Debian'
 
     - name: Set the test GitLab version number for RedHat 7.