Merge branch 'master' into doc-add-extra-args-example

containers · Oct 31, 2022 · 4586876 · 4586876
2 parents fcaa701 + c952149
commit 4586876
Show file tree

Hide file tree

Showing 38 changed files with 992 additions and 73 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+---
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/collection-continuous-integration.yml b/.github/workflows/collection-continuous-integration.yml
@@ -20,9 +20,9 @@ jobs:
           - 3.8
     steps:
       - name: Check out ${{ github.repository }} on disk
-        uses: actions/checkout@master
+        uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.runner-python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.runner-python-version }}
       - name: Set up pip cache
@@ -41,7 +41,7 @@ jobs:
           ~/.local/bin/ansible-galaxy collection build --output-path
           "${GITHUB_WORKSPACE}/.cache/collection-tarballs"
       - name: Store migrated collection artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: collection
           path: .cache/collection-tarballs
@@ -81,7 +81,7 @@ jobs:
 
     steps:
       - name: Set up Python ${{ matrix.runner-python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.runner-python-version }}
       - name: Set up pip cache
@@ -96,7 +96,7 @@ jobs:
         run: >-
           python -m pip install --user '${{ matrix.ansible-version }}'
       - name: Download migrated collection artifacts
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: collection
           path: .cache/collection-tarballs

diff --git a/.github/workflows/collection-publish-dry-run.yml b/.github/workflows/collection-publish-dry-run.yml
@@ -34,10 +34,10 @@ jobs:
     steps:
 
       - name: Check out ${{ github.repository }} on disk
-        uses: actions/checkout@master
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.runner-python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.runner-python-version }}
 

diff --git a/.github/workflows/collection-publish.yml b/.github/workflows/collection-publish.yml
@@ -19,10 +19,10 @@ jobs:
     steps:
 
       - name: Check out ${{ github.repository }} on disk
-        uses: actions/checkout@master
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.runner-python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.runner-python-version }}
 

diff --git a/.github/workflows/connections_tests.yml b/.github/workflows/connections_tests.yml
@@ -38,9 +38,9 @@ jobs:
           - 3.8
     steps:
       - name: Check out ${{ github.repository }} on disk
-        uses: actions/checkout@master
+        uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.runner-python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.runner-python-version }}
       - name: Set up pip cache
@@ -59,7 +59,7 @@ jobs:
           ~/.local/bin/ansible-galaxy collection build --output-path
           "${GITHUB_WORKSPACE}/.cache/collection-tarballs"
       - name: Store migrated collection artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: collection
           path: .cache/collection-tarballs
@@ -94,10 +94,10 @@ jobs:
     steps:
 
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -120,7 +120,7 @@ jobs:
         run: python -m pip install --user '${{ matrix.ansible-version }}'
 
       - name: Download migrated collection artifacts
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: collection
           path: .cache/collection-tarballs
@@ -184,10 +184,10 @@ jobs:
     steps:
 
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -210,7 +210,7 @@ jobs:
         run: python -m pip install --user '${{ matrix.ansible-version }}'
 
       - name: Download migrated collection artifacts
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: collection
           path: .cache/collection-tarballs

diff --git a/.github/workflows/podman_container.yml b/.github/workflows/podman_container.yml
@@ -52,10 +52,10 @@ jobs:
     steps:
 
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -134,10 +134,10 @@ jobs:
     steps:
 
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 

diff --git a/.github/workflows/podman_container_idem.yml b/.github/workflows/podman_container_idem.yml
@@ -49,10 +49,10 @@ jobs:
     steps:
 
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 

diff --git a/.github/workflows/podman_container_info.yml b/.github/workflows/podman_container_info.yml
@@ -51,10 +51,10 @@ jobs:
     steps:
 
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 

diff --git a/.github/workflows/podman_containers.yml b/.github/workflows/podman_containers.yml
@@ -52,10 +52,10 @@ jobs:
     steps:
 
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 

diff --git a/.github/workflows/podman_export.yml b/.github/workflows/podman_export.yml
@@ -45,10 +45,10 @@ jobs:
     steps:
 
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 

diff --git a/.github/workflows/podman_generate_systemd.yml b/.github/workflows/podman_generate_systemd.yml
@@ -0,0 +1,99 @@
+name: Podman generate systemd
+
+on:
+  push:
+    paths:
+      - '.github/workflows/podman_generate_systemd.yml'
+      - 'ci/*.yml'
+      - 'ci/run_containers_tests.sh'
+      - 'ci/playbooks/containers/podman_generate_systemd.yml'
+      - 'plugins/modules/podman_generate_systemd.py'
+      - 'tests/integration/targets/podman_generate_systemd/**'
+    branches:
+      - master
+  pull_request:
+    paths:
+      - '.github/workflows/podman_generate_systemd.yml'
+      - 'ci/*.yml'
+      - 'ci/run_containers_tests.sh'
+      - 'ci/playbooks/containers/podman_generate_systemd.yml'
+      - 'plugins/modules/podman_generate_systemd.py'
+      - 'tests/integration/targets/podman_generate_systemd/**'
+  schedule:
+    - cron: 4 0 * * *  # Run daily at 0:03 UTC
+
+jobs:
+
+  test_podman_generate_systemd:
+    name: Podman generate systemd ${{ matrix.ansible-version }}-${{ matrix.os || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.os || 'ubuntu-latest' }}
+    defaults:
+      run:
+        shell: bash
+    strategy:
+      fail-fast: false
+      matrix:
+        ansible-version:
+          - ansible<2.10
+          # - git+https://github.com/ansible/[email protected]
+          - git+https://github.com/ansible/ansible.git@devel
+        os:
+          - ubuntu-22.04
+        python-version:
+          - 3.9
+
+    steps:
+
+      - name: Check out repository
+        uses: actions/checkout@v3
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Upgrade pip and display Python and PIP versions
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y python*-wheel python*-yaml
+          python -m pip install --upgrade pip
+          python -V
+          pip --version
+      - name: Set up pip cache
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ github.ref }}-units-VMs
+          restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+      - name: Install Ansible ${{ 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
+      - name: Run collection tests for Podman generate systemd
+        run: |
+          export PATH=~/.local/bin:$PATH
+          echo "Run ansible version"
+          command -v ansible
+          ansible --version
+          export ANSIBLE_CONFIG=$(pwd)/ci/ansible-dev.cfg
+          if [[ '${{ matrix.ansible-version }}'  == 'ansible<2.10' ]]; then
+            export ANSIBLE_CONFIG=$(pwd)/ci/ansible-2.9.cfg
+          fi
+          echo $ANSIBLE_CONFIG
+          command -v ansible-playbook
+          pip --version
+          python --version
+          ansible-playbook --version
+          ansible-playbook -vv ci/playbooks/pre.yml \
+          -e host=localhost \
+          -i localhost, \
+          -e ansible_connection=local \
+          -e setup_python=false
+          TEST2RUN=podman_generate_systemd ./ci/run_containers_tests.sh
+        shell: bash
diff --git a/.github/workflows/podman_image.yml b/.github/workflows/podman_image.yml
@@ -47,10 +47,10 @@ jobs:
     steps:
 
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 

diff --git a/.github/workflows/podman_image_info.yml b/.github/workflows/podman_image_info.yml
@@ -47,10 +47,10 @@ jobs:
     steps:
 
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 

diff --git a/.github/workflows/podman_import.yml b/.github/workflows/podman_import.yml
@@ -45,10 +45,10 @@ jobs:
     steps:
 
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 

diff --git a/.github/workflows/podman_load.yml b/.github/workflows/podman_load.yml
@@ -45,10 +45,10 @@ jobs:
     steps:
 
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 

diff --git a/.github/workflows/podman_login.yml b/.github/workflows/podman_login.yml
@@ -45,10 +45,10 @@ jobs:
     steps:
 
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 

diff --git a/.github/workflows/podman_login_info.yml b/.github/workflows/podman_login_info.yml
@@ -45,10 +45,10 @@ jobs:
     steps:
 
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}