Add ubuntu 20.04 to CI as it has podman 2.0.1 version

Fix idempotency issues in podman_container Add creating workdir, buildah issue: containers/buildah#2475
sshnaidm · Jul 16, 2020 · 2d39e5f · 2d39e5f
1 parent 8bfe740
commit 2d39e5f
Show file tree

Hide file tree

Showing 16 changed files with 162 additions and 61 deletions.
diff --git a/.github/workflows/collection-continuous-integration.yml b/.github/workflows/collection-continuous-integration.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         runner-os:
-          - ubuntu-16.04
+          - ubuntu-latest
         ansible-version:
           - git+https://github.com/ansible/[email protected]
         runner-python-version:
@@ -65,6 +65,16 @@ jobs:
         python-version:
           - 2.7
           - 3.7
+        exclude:
+          - runner-os: ubuntu-latest
+            runner-python-version: 3.7
+            ansible-version: git+https://github.com/ansible/ansible.git@devel
+            python-version: 3.7
+        include:
+          - runner-os: ubuntu-20.04
+            runner-python-version: 3.7
+            ansible-version: git+https://github.com/ansible/ansible.git@devel
+            python-version: 3.7
 
     steps:
       - name: Set up Python ${{ matrix.runner-python-version }}

diff --git a/.github/workflows/connections_tests.yml b/.github/workflows/connections_tests.yml
@@ -65,10 +65,10 @@ jobs:
           path: .cache/collection-tarballs
 
   test-podman-connection:
-    name: Podman connection VM ${{ matrix.os.vm || 'ubuntu-latest' }}-${{ matrix.ansible-version }}
+    name: Podman connection VM ${{ matrix.os || 'ubuntu-latest' }}-${{ matrix.ansible-version }}
     needs:
       - build-collection-artifact-connection-tests
-    runs-on: ${{ matrix.os.vm || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.os || 'ubuntu-latest' }}
     defaults:
       run:
         shell: bash
@@ -77,17 +77,22 @@ jobs:
       matrix:
         ansible-version:
           - ansible<2.10
-          - git+https://github.com/ansible/ansible.git@devel
+          - git+https://github.com/ansible/ansible.git@stable-2.10
         os:
-          - vm: ubuntu-latest
-          #- vm: ubuntu-16.04
-          #- vm: macos-latest
+          - ubuntu-latest
+          #- ubuntu-20.04
+          #- ubuntu-16.04
+          #- macos-latest
         python-version:
           #- 3.8
           - 3.7
           #- 3.6
           #- 3.5
           #- 2.7
+        include:
+          - os: ubuntu-20.04
+            ansible-version: git+https://github.com/ansible/ansible.git@devel
+            python-version: 3.7
     steps:
 
       - name: Check out repository
@@ -153,10 +158,10 @@ jobs:
         shell: bash
 
   test-buildah-connection:
-    name: Buildah connection VM ${{ matrix.os.vm || 'ubuntu-latest' }}-${{ matrix.ansible-version }}
+    name: Buildah connection VM ${{ matrix.os || 'ubuntu-latest' }}-${{ matrix.ansible-version }}
     needs:
       - build-collection-artifact-connection-tests
-    runs-on: ${{ matrix.os.vm || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.os || 'ubuntu-latest' }}
     defaults:
       run:
         shell: bash
@@ -165,17 +170,22 @@ jobs:
       matrix:
         ansible-version:
           - ansible<2.10
-          - git+https://github.com/ansible/ansible.git@devel
+          - git+https://github.com/ansible/ansible.git@stable-2.10
         os:
-          - vm: ubuntu-latest
-          #- vm: ubuntu-16.04
-          #- vm: macos-latest
+          - ubuntu-latest
+          #- ubuntu-20.04
+          #- ubuntu-16.04
+          #- macos-latest
         python-version:
           #- 3.8
           - 3.7
           #- 3.6
           #- 3.5
           #- 2.7
+        include:
+          - os: ubuntu-20.04
+            ansible-version: git+https://github.com/ansible/ansible.git@devel
+            python-version: 3.7
     steps:
 
       - name: Check out repository

diff --git a/.github/workflows/podman_container.yml b/.github/workflows/podman_container.yml
@@ -25,8 +25,8 @@ on:
 jobs:
 
   test_podman_container:
-    name: Podman container ${{ matrix.ansible-version }}-${{ matrix.os.vm || 'ubuntu-latest' }}
-    runs-on: ${{ matrix.os.vm || 'ubuntu-latest' }}
+    name: Podman container ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.os || 'ubuntu-latest' }}
     defaults:
       run:
         shell: bash
@@ -35,11 +35,15 @@ jobs:
       matrix:
         ansible-version:
           - ansible<2.10
-          - git+https://github.com/ansible/ansible.git@devel
+          #- git+https://github.com/ansible/ansible.git@stable-2.10
         os:
-          - vm: ubuntu-latest
+          - ubuntu-latest
         python-version:
           - 3.7
+        include:
+          - os: ubuntu-20.04
+            ansible-version: git+https://github.com/ansible/ansible.git@devel
+            python-version: 3.7
     steps:
 
       - name: Check out repository
@@ -66,14 +70,18 @@ jobs:
             ${{ runner.os }}-
 
       - name: Install Ansible ${{ matrix.ansible-version }}
-        run: python -m pip install --user '${{ matrix.ansible-version }}'
+        run: python3 -m pip install --user --force-reinstall --upgrade '${{ matrix.ansible-version }}'
 
       - name: Build and install the collection tarball
         run: |
+          export PATH=~/.local/bin:$PATH
+
+          echo "Run ansible version"
+          command -v ansible
+          ansible --version
           rm -rf /tmp/just_new_collection
           ~/.local/bin/ansible-galaxy collection build --output-path /tmp/just_new_collection --force
           ~/.local/bin/ansible-galaxy collection install -vvv --force /tmp/just_new_collection/*.tar.gz
-          sudo ~/.local/bin/ansible-galaxy collection install -vvv --force /tmp/just_new_collection/*.tar.gz
 
       - name: Run collection tests for podman container
         run: |

diff --git a/.github/workflows/podman_container_idem.yml b/.github/workflows/podman_container_idem.yml
@@ -25,8 +25,8 @@ on:
 jobs:
 
   test_podman_container_idem:
-    name: Podman container ${{ matrix.ansible-version }}-${{ matrix.os.vm || 'ubuntu-latest' }}
-    runs-on: ${{ matrix.os.vm || 'ubuntu-latest' }}
+    name: Podman container ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.os || 'ubuntu-latest' }}
     defaults:
       run:
         shell: bash
@@ -35,11 +35,15 @@ jobs:
       matrix:
         ansible-version:
           - ansible<2.10
-          # - git+https://github.com/ansible/ansible.git@devel
+          # - git+https://github.com/ansible/ansible.git@stable-2.10
         os:
-          - vm: ubuntu-latest
+          - ubuntu-latest
         python-version:
           - 3.7
+        include:
+          - os: ubuntu-20.04
+            "ansible-version": git+https://github.com/ansible/ansible.git@devel
+            "python-version": 3.7
     steps:
 
       - name: Check out repository
@@ -66,19 +70,22 @@ jobs:
             ${{ runner.os }}-
 
       - name: Install Ansible ${{ matrix.ansible-version }}
-        run: python -m pip install --user '${{ matrix.ansible-version }}'
+        run: python3 -m pip install --user --force-reinstall --upgrade '${{ matrix.ansible-version }}'
 
       - name: Build and install the collection tarball
         run: |
           rm -rf /tmp/just_new_collection
           ~/.local/bin/ansible-galaxy collection build --output-path /tmp/just_new_collection --force
           ~/.local/bin/ansible-galaxy collection install -vvv --force /tmp/just_new_collection/*.tar.gz
-          sudo ~/.local/bin/ansible-galaxy collection install -vvv --force /tmp/just_new_collection/*.tar.gz
 
       - name: Run idempotency tests for podman container
         run: |
           export PATH=~/.local/bin:$PATH
 
+          echo "Run ansible version"
+          command -v ansible
+          ansible --version
+
           if [[ '${{ matrix.ansible-version }}'  == 'git+https://github.com/ansible/ansible.git@devel' ]]; then
             export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg
           elif [[ '${{ matrix.ansible-version }}'  == 'ansible<2.10' ]]; then

diff --git a/.github/workflows/podman_container_info.yml b/.github/workflows/podman_container_info.yml
@@ -25,8 +25,8 @@ on:
 jobs:
 
   test_podman_container_info:
-    name: Podman container info ${{ matrix.ansible-version }}-${{ matrix.os.vm || 'ubuntu-latest' }}
-    runs-on: ${{ matrix.os.vm || 'ubuntu-latest' }}
+    name: Podman container info ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.os || 'ubuntu-latest' }}
     defaults:
       run:
         shell: bash
@@ -35,11 +35,15 @@ jobs:
       matrix:
         ansible-version:
           - ansible<2.10
-          - git+https://github.com/ansible/ansible.git@devel
+          # - git+https://github.com/ansible/ansible.git@stable-2.10
         os:
-          - vm: ubuntu-latest
+          - ubuntu-latest
         python-version:
           - 3.7
+        include:
+          - os: ubuntu-20.04
+            ansible-version: git+https://github.com/ansible/ansible.git@devel
+            python-version: 3.7
     steps:
 
       - name: Check out repository
@@ -66,19 +70,22 @@ jobs:
             ${{ runner.os }}-
 
       - name: Install Ansible ${{ matrix.ansible-version }}
-        run: python -m pip install --user '${{ matrix.ansible-version }}'
+        run: python3 -m pip install --user --force-reinstall --upgrade '${{ matrix.ansible-version }}'
 
       - name: Build and install the collection tarball
         run: |
           rm -rf /tmp/just_new_collection
           ~/.local/bin/ansible-galaxy collection build --output-path /tmp/just_new_collection --force
           ~/.local/bin/ansible-galaxy collection install -vvv --force /tmp/just_new_collection/*.tar.gz
-          sudo ~/.local/bin/ansible-galaxy collection install -vvv --force /tmp/just_new_collection/*.tar.gz
 
       - name: Run collection tests for podman container info
         run: |
           export PATH=~/.local/bin:$PATH
 
+          echo "Run ansible version"
+          command -v ansible
+          ansible --version
+
           if [[ '${{ matrix.ansible-version }}'  == 'git+https://github.com/ansible/ansible.git@devel' ]]; then
             export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg
           elif [[ '${{ matrix.ansible-version }}'  == 'ansible<2.10' ]]; then

diff --git a/.github/workflows/podman_image.yml b/.github/workflows/podman_image.yml
@@ -25,8 +25,8 @@ on:
 jobs:
 
   test_podman_image:
-    name: Podman image ${{ matrix.ansible-version }}-${{ matrix.os.vm || 'ubuntu-latest' }}
-    runs-on: ${{ matrix.os.vm || 'ubuntu-latest' }}
+    name: Podman image ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.os || 'ubuntu-latest' }}
     defaults:
       run:
         shell: bash
@@ -35,11 +35,15 @@ jobs:
       matrix:
         ansible-version:
           - ansible<2.10
-          - git+https://github.com/ansible/ansible.git@devel
+          # - git+https://github.com/ansible/ansible.git@stable-2.10
         os:
-          - vm: ubuntu-latest
+          - ubuntu-latest
         python-version:
           - 3.7
+        include:
+          - os: ubuntu-20.04
+            ansible-version: git+https://github.com/ansible/ansible.git@devel
+            python-version: 3.7
     steps:
 
       - name: Check out repository
@@ -66,19 +70,22 @@ jobs:
             ${{ runner.os }}-
 
       - name: Install Ansible ${{ matrix.ansible-version }}
-        run: python -m pip install --user '${{ matrix.ansible-version }}'
+        run: python3 -m pip install --user --force-reinstall --upgrade '${{ matrix.ansible-version }}'
 
       - name: Build and install the collection tarball
         run: |
           rm -rf /tmp/just_new_collection
           ~/.local/bin/ansible-galaxy collection build --output-path /tmp/just_new_collection --force
           ~/.local/bin/ansible-galaxy collection install -vvv --force /tmp/just_new_collection/*.tar.gz
-          sudo ~/.local/bin/ansible-galaxy collection install -vvv --force /tmp/just_new_collection/*.tar.gz
 
       - name: Run collection tests for podman image
         run: |
           export PATH=~/.local/bin:$PATH
 
+          echo "Run ansible version"
+          command -v ansible
+          ansible --version
+
           if [[ '${{ matrix.ansible-version }}'  == 'git+https://github.com/ansible/ansible.git@devel' ]]; then
             export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg
           elif [[ '${{ matrix.ansible-version }}'  == 'ansible<2.10' ]]; then

diff --git a/.github/workflows/podman_image_info.yml b/.github/workflows/podman_image_info.yml
@@ -25,8 +25,8 @@ on:
 jobs:
 
   test_podman_image_info:
-    name: Podman image info ${{ matrix.ansible-version }}-${{ matrix.os.vm || 'ubuntu-latest' }}
-    runs-on: ${{ matrix.os.vm || 'ubuntu-latest' }}
+    name: Podman image info ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.os || 'ubuntu-latest' }}
     defaults:
       run:
         shell: bash
@@ -35,11 +35,15 @@ jobs:
       matrix:
         ansible-version:
           - ansible<2.10
-          - git+https://github.com/ansible/ansible.git@devel
+          # - git+https://github.com/ansible/ansible.git@stable-2.10
         os:
-          - vm: ubuntu-latest
+          - ubuntu-latest
         python-version:
           - 3.7
+        include:
+          - os: ubuntu-20.04
+            ansible-version: git+https://github.com/ansible/ansible.git@devel
+            python-version: 3.7
     steps:
 
       - name: Check out repository
@@ -66,19 +70,22 @@ jobs:
             ${{ runner.os }}-
 
       - name: Install Ansible ${{ matrix.ansible-version }}
-        run: python -m pip install --user '${{ matrix.ansible-version }}'
+        run: python3 -m pip install --user --force-reinstall --upgrade '${{ matrix.ansible-version }}'
 
       - name: Build and install the collection tarball
         run: |
           rm -rf /tmp/just_new_collection
           ~/.local/bin/ansible-galaxy collection build --output-path /tmp/just_new_collection --force
           ~/.local/bin/ansible-galaxy collection install -vvv --force /tmp/just_new_collection/*.tar.gz
-          sudo ~/.local/bin/ansible-galaxy collection install -vvv --force /tmp/just_new_collection/*.tar.gz
 
       - name: Run collection tests for podman image info
         run: |
           export PATH=~/.local/bin:$PATH
 
+          echo "Run ansible version"
+          command -v ansible
+          ansible --version
+
           if [[ '${{ matrix.ansible-version }}'  == 'git+https://github.com/ansible/ansible.git@devel' ]]; then
             export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg
           elif [[ '${{ matrix.ansible-version }}'  == 'ansible<2.10' ]]; then