Use makefile for molecule tests

Related PR: #305
vitabaks · May 2, 2023 · 061a9ee · 061a9ee
1 parent 68c534e
commit 061a9ee
Show file tree

Hide file tree

Showing 16 changed files with 113 additions and 112 deletions.
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
@@ -61,19 +61,19 @@ jobs:
             namespace: glillico
 
     steps:
-      - name: checkout
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.10'
 
       - name: Install dependencies
-        run: pip3 install 'molecule[docker]<5.0.0' ansible
+        run: make bootstrap
 
       - name: Run Molecule tests
-        run: molecule test
+        run: make molecule-test
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'

diff --git a/.github/workflows/molecule_pgpro.yml b/.github/workflows/molecule_pgpro.yml
@@ -21,22 +21,23 @@ jobs:
           - ubuntu2204
 
     steps:
-      - name: checkout
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.10'
 
       - name: Install dependencies
-        run: pip3 install 'molecule[docker]<5.0.0' ansible
+        run: make bootstrap
 
       - name: Run Molecule tests for PostgresPro
-        run: molecule test --scenario-name postgrespro
+        run: make molecule-test-scenario
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'
           IMAGE_DISTRO: ${{ matrix.distro }}
+          MOLECULE_SCENARIO: 'postgrespro'
 
 ...
diff --git a/.github/workflows/schedule_pg_almalinux8.yml b/.github/workflows/schedule_pg_almalinux8.yml
@@ -11,19 +11,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: checkout
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.10'
 
       - name: Install dependencies
-        run: pip3 install 'molecule[docker]<5.0.0' ansible
+        run: make bootstrap
 
       - name: Run Molecule tests
-        run: molecule test
+        run: make molecule-test
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'

diff --git a/.github/workflows/schedule_pg_almalinux9.yml b/.github/workflows/schedule_pg_almalinux9.yml
@@ -11,19 +11,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: checkout
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.10'
 
       - name: Install dependencies
-        run: pip3 install 'molecule[docker]<5.0.0' ansible
+        run: make bootstrap
 
       - name: Run Molecule tests
-        run: molecule test
+        run: make molecule-test
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'

diff --git a/.github/workflows/schedule_pg_centos8.yml b/.github/workflows/schedule_pg_centos8.yml
@@ -11,19 +11,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: checkout
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.10'
 
       - name: Install dependencies
-        run: pip3 install 'molecule[docker]<5.0.0' ansible
+        run: make bootstrap
 
       - name: Run Molecule tests
-        run: molecule test
+        run: make molecule-test
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'

diff --git a/.github/workflows/schedule_pg_centosstream8.yml b/.github/workflows/schedule_pg_centosstream8.yml
@@ -11,19 +11,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: checkout
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.10'
 
       - name: Install dependencies
-        run: pip3 install 'molecule[docker]<5.0.0' ansible
+        run: make bootstrap
 
       - name: Run Molecule tests
-        run: molecule test
+        run: make molecule-test
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'

diff --git a/.github/workflows/schedule_pg_centosstream9.yml b/.github/workflows/schedule_pg_centosstream9.yml
@@ -11,19 +11,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: checkout
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.10'
 
       - name: Install dependencies
-        run: pip3 install 'molecule[docker]<5.0.0' ansible
+        run: make bootstrap
 
       - name: Run Molecule tests
-        run: molecule test
+        run: make molecule-test
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'

diff --git a/.github/workflows/schedule_pg_debian10.yml b/.github/workflows/schedule_pg_debian10.yml
@@ -11,19 +11,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: checkout
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.10'
 
       - name: Install dependencies
-        run: pip3 install 'molecule[docker]<5.0.0' ansible
+        run: make bootstrap
 
       - name: Run Molecule tests
-        run: molecule test
+        run: make molecule-test
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'

diff --git a/.github/workflows/schedule_pg_debian11.yml b/.github/workflows/schedule_pg_debian11.yml
@@ -11,19 +11,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: checkout
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.10'
 
       - name: Install dependencies
-        run: pip3 install 'molecule[docker]<5.0.0' ansible
+        run: make bootstrap
 
       - name: Run Molecule tests
-        run: molecule test
+        run: make molecule-test
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'

diff --git a/.github/workflows/schedule_pg_oracle_linux8.yml b/.github/workflows/schedule_pg_oracle_linux8.yml
@@ -11,19 +11,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: checkout
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.10'
 
       - name: Install dependencies
-        run: pip3 install 'molecule[docker]<5.0.0' ansible
+        run: make bootstrap
 
       - name: Run Molecule tests
-        run: molecule test
+        run: make molecule-test
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'

diff --git a/.github/workflows/schedule_pg_oracle_linux9.yml b/.github/workflows/schedule_pg_oracle_linux9.yml
@@ -11,19 +11,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: checkout
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.10'
 
       - name: Install dependencies
-        run: pip3 install 'molecule[docker]<5.0.0' ansible
+        run: make bootstrap
 
       - name: Run Molecule tests
-        run: molecule test
+        run: make molecule-test
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'

diff --git a/.github/workflows/schedule_pg_rockylinux8.yml b/.github/workflows/schedule_pg_rockylinux8.yml
@@ -11,19 +11,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: checkout
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.10'
 
       - name: Install dependencies
-        run: pip3 install 'molecule[docker]<5.0.0' ansible
+        run: make bootstrap
 
       - name: Run Molecule tests
-        run: molecule test
+        run: make molecule-test
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'

diff --git a/.github/workflows/schedule_pg_rockylinux9.yml b/.github/workflows/schedule_pg_rockylinux9.yml
@@ -11,19 +11,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: checkout
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.10'
 
       - name: Install dependencies
-        run: pip3 install 'molecule[docker]<5.0.0' ansible
+        run: make bootstrap
 
       - name: Run Molecule tests
-        run: molecule test
+        run: make molecule-test
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'

diff --git a/.github/workflows/schedule_pg_ubuntu1804.yml b/.github/workflows/schedule_pg_ubuntu1804.yml
@@ -11,19 +11,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: checkout
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.10'
 
       - name: Install dependencies
-        run: pip3 install 'molecule[docker]<5.0.0' ansible
+        run: make bootstrap
 
       - name: Run Molecule tests
-        run: molecule test
+        run: make molecule-test
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'