Work around variable interpolation bug in molecule-docker by downgrading

galaxyproject · Nov 11, 2022 · c0bd3b3 · c0bd3b3
1 parent b93fa01
commit c0bd3b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
@@ -14,8 +14,9 @@ jobs:
       matrix:
         scenario:
           - default
-        molecule-image:
+        from-image:
           - centos:7
+          - ubuntu:20.04
         galaxy-version:
           - '21.01'
           - '22.01'
@@ -28,13 +29,16 @@ jobs:
         with:
           python-version: '3.x'
 
+      # The molecule-docker pin can be removed after molecule-docker>2.1.0 is released, see:
+      # https://github.com/ansible-community/molecule/issues/3733
       - name: Install dependencies
-        run: pip3 install molecule[docker] ansible-core
+        run: pip3 install molecule[docker] ansible-core 'molecule-docker!=2.1.0'
 
       - name: Run molecule
         run: molecule test -s ${{ matrix.scenario }}
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'
           ANSIBLE_STDOUT_CALLBACK: yaml
+          FROM_IMAGE: '${{ matrix.from-image }}'
           GALAXY_COMMIT_ID: '${{ matrix.galaxy-version }}'
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -10,7 +10,6 @@ driver:
 platforms:
   - name: galaxy-scenario-default
     image: ${FROM_IMAGE:-centos:7}
-    #command: /usr/lib/systemd/systemd
     # override default sleep loop, use Dockerfile CMD
     command: ""
     volumes:
@@ -20,7 +19,6 @@ platforms:
     pre_build_image: false
 provisioner:
   name: ansible
-  log: true
   env:
     GALAXY_COMMIT_ID: ${GALAXY_COMMIT_ID:-dev}
 verifier: