Merge pull request #152 from fao89/moldocker

Update molecule deps
pulp · Jun 3, 2021 · 70b1388 · 70b1388
2 parents 2bbec4a + 4b67aa6
commit 70b1388
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -201,10 +201,10 @@ jobs:
           # by default, it uses a depth of 1
           # this fetches all history so that we can read each commit
           fetch-depth: 0
-      - name: Set up Python 3.7
+      - name: Set up Python 3.9
         uses: actions/setup-python@v1
         with:
-          python-version: '3.7'
+          python-version: '3.9'
       - name: Install httpie
         run: |
           echo ::group::HTTPIE
@@ -219,7 +219,9 @@ jobs:
         run: |
           pip install --upgrade pip
           sudo apt remove ansible
-          pip install "ansible<4.0" molecule[docker,lint]==3.2.3 openshift==0.11.0 jmespath pipdeptree
+          pip install ansible molecule[docker,lint] six openshift==0.11.0 jmespath pipdeptree
+          ansible-galaxy collection install --force community.docker
+          ansible --version
           pipdeptree
       - name: Molecule
         run: .ci/scripts/molecule.sh

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -263,10 +263,10 @@ jobs:
           # by default, it uses a depth of 1
           # this fetches all history so that we can read each commit
           fetch-depth: 0
-      - name: Set up Python 3.7
+      - name: Set up Python 3.9
         uses: actions/setup-python@v1
         with:
-          python-version: '3.7'
+          python-version: '3.9'
       - name: Install httpie
         run: |
           echo ::group::HTTPIE
@@ -281,7 +281,9 @@ jobs:
         run: |
           pip install --upgrade pip
           sudo apt remove ansible
-          pip install "ansible<4.0" molecule[docker,lint]==3.2.3 openshift==0.11.0 jmespath pipdeptree
+          pip install ansible molecule[docker,lint] six openshift==0.11.0 jmespath pipdeptree
+          ansible-galaxy collection install --force community.docker
+          ansible --version
           pipdeptree
       - name: Molecule
         run: .ci/scripts/molecule.sh