fixup gha

Alfresco · Nov 22, 2024 · 1c3ce50 · 1c3ce50
1 parent 76b43fa
commit 1c3ce50
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/community.yml b/.github/workflows/community.yml
@@ -35,15 +35,25 @@ jobs:
           - image: rockylinux/rockylinux:9.4
         role:
           - name: activemq
+            path: roles
           - name: common
+            path: collections/alfresco/platform/roles
           - name: elasticsearch
+            path: roles
           - name: identity
+            path: roles
           - name: java
+            path: roles
           - name: nginx
+            path: roles
           - name: postgres
+            path: roles
           - name: search
+            path: roles
           - name: tomcat
+            path: roles
           - name: transformers
+            path: roles
     env:
       PY_COLORS: 1
       PYTHONUNBUFFERED: 1
@@ -74,7 +84,7 @@ jobs:
           timeout_minutes: 60
           max_attempts: 3
           retry_wait_seconds: 10
-          command: cd roles/${{ matrix.role.name }} && pipenv run molecule test
+          command: cd ${{ matrix.role.path }}/${{ matrix.role.name }} && pipenv run molecule test
 
   docker_integration:
     name: Test ${{ matrix.scenario.name }} scenario on ${{ matrix.molecule_distro.image }}

diff --git a/collections/alfresco/platform/roles/common/molecule/default/molecule.yml b/collections/alfresco/platform/roles/common/molecule/default/molecule.yml
@@ -6,7 +6,7 @@ driver:
 platforms:
   - name: common-instance
     image: $MOLECULE_ROLE_IMAGE
-    dockerfile: ../../../../tests/molecule/Dockerfile-noprivs.j2
+    dockerfile: ../../../../../../../tests/molecule/Dockerfile-noprivs.j2
     command: "/lib/systemd/systemd"
     privileged: true
     tmpfs:
@@ -24,7 +24,7 @@ provisioner:
       pipelining: True
   inventory:
     links:
-      group_vars: ../../../../group_vars
+      group_vars: ../../../../../../../group_vars
       host_vars: host_vars
 verifier:
   name: testinfra