Merging upstream version 9.4.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 56 insertions, 32 deletions

diff --git a/ansible_collections/ngine_io/exoscale/.github/dependabot.yml b/ansible_collections/ngine_io/exoscale/.github/dependabot.yml
new file mode 100644
index 000000000..607e7e1a2
--- /dev/null
+++ b/ansible_collections/ngine_io/exoscale/.github/dependabot.yml
@@ -0,0 +1,8 @@
+# Set update schedule for GitHub Actions
+---
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/ansible_collections/ngine_io/exoscale/.github/workflows/publish.yml b/ansible_collections/ngine_io/exoscale/.github/workflows/publish.yml
index 0318edfc4..2bcd079fe 100644
--- a/ansible_collections/ngine_io/exoscale/.github/workflows/publish.yml
+++ b/ansible_collections/ngine_io/exoscale/.github/workflows/publish.yml
@@ -7,19 +7,24 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ansible_collections/ngine_io/exoscale
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up Python
-      uses: actions/setup-python@v1
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install ansible
-    - name: Build and publish
-      env:
-        ANSIBLE_GALAXY_API_KEY: ${{ secrets.ANSIBLE_GALAXY_API_KEY }}
-      run: |
-        ansible-galaxy collection build .
-        ansible-galaxy collection publish *.tar.gz --api-key $ANSIBLE_GALAXY_API_KEY
+      - uses: actions/checkout@v3
+        with:
+          path: ansible_collections/ngine_io/exoscale
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.x"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install ansible
+      - name: Build and publish
+        env:
+          ANSIBLE_GALAXY_API_KEY: ${{ secrets.ANSIBLE_GALAXY_API_KEY }}
+        run: |
+          ansible-galaxy collection build .
+          ansible-galaxy collection publish *.tar.gz --api-key $ANSIBLE_GALAXY_API_KEY
diff --git a/ansible_collections/ngine_io/exoscale/.github/workflows/sanity.yml b/ansible_collections/ngine_io/exoscale/.github/workflows/sanity.yml
index 7e0fab5b9..b646882e0 100644
--- a/ansible_collections/ngine_io/exoscale/.github/workflows/sanity.yml
+++ b/ansible_collections/ngine_io/exoscale/.github/workflows/sanity.yml
@@ -1,31 +1,42 @@
 name: Sanity
 on:
-- pull_request
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "5 12 * * *"
+  pull_request:
+  workflow_call:
+  workflow_dispatch:
 
 jobs:
   sanity:
     name: Sanity (${{ matrix.ansible }})
+    runs-on: ubuntu-20.04
+    defaults:
+      run:
+        working-directory: ansible_collections/ngine_io/exoscale
     strategy:
       matrix:
         ansible:
-        - stable-2.10
-        - stable-2.9
-        - devel
-    runs-on: ubuntu-latest
+          - stable-2.14
+          - devel
     steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+        with:
+          path: ansible_collections/ngine_io/exoscale
 
-    - name: Check out code
-      uses: actions/checkout@v1
-      with:
-        path: ansible_collections/ngine_io/exoscale
+      - name: Set up Python 3
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
 
-    - name: Set up Python 3.6
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.6
+      - name: Install ansible-base (${{ matrix.ansible }})
+        run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
 
-    - name: Install ansible-base (${{ matrix.ansible }})
-      run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
+      - name: Install dependencies
+        run: ansible-galaxy collection install -p ../../ ngine_io.cloudstack
 
-    - name: Run sanity tests
-      run: ansible-test sanity --docker -v --color --python 3.6
+      - name: Run sanity tests
+        run: ansible-test sanity --docker -v --color