Upgrade minimum Ansible version to v2.14 and test against Ansible v2.…

…14 and v2.15 chore: bump ansible versions
ansible-collections · Nov 21, 2023 · fadb559 · fadb559
2 parents cd881b4 + 2ca4ecc
commit fadb559
Show file tree

Hide file tree

Showing 342 changed files with 4,464 additions and 4,371 deletions.
diff --git a/.github/workflows/ansible-integration-tests.yml b/.github/workflows/ansible-integration-tests.yml
@@ -1,11 +1,12 @@
-name: "Run integration tests for the cloud.google collection"
+---
+name: Run integration tests for the cloud.google collection
 on:
   pull_request: {}
   push:
     branches: master
 env:
-  GCP_SERVICE_ACCOUNT: "github-ci@ansible-gcp-ci.iam.gserviceaccount.com"
-  GCP_PROJECT: "ansible-gcp-ci"
+  GCP_SERVICE_ACCOUNT: github-ci@ansible-gcp-ci.iam.gserviceaccount.com
+  GCP_PROJECT: ansible-gcp-ci
   GCP_FOLDER_ID: "542027184392"
 jobs:
   integration:
@@ -18,9 +19,11 @@ jobs:
       run:
         working-directory: ansible_collections/google/cloud
     strategy:
+      max-parallel: 1
       matrix:
         ansible_version:
-          - stable-2.13
+          - stable-2.14
+          - stable-2.15
     steps:
       - name: check out code
         uses: actions/checkout@v4
@@ -53,15 +56,15 @@ jobs:
         env:
           CI_SERVICE_ACCOUNT_FILE_CONTENTS: ${{ secrets.CI_SERVICE_ACCOUNT_FILE_CONTENTS }}
         with:
-          service_account: "$GCP_SERVICE_ACCOUNT"
-          credentials_json: "${{ secrets.CI_SERVICE_ACCOUNT_FILE_CONTENTS }}"
+          service_account: $GCP_SERVICE_ACCOUNT
+          credentials_json: ${{ secrets.CI_SERVICE_ACCOUNT_FILE_CONTENTS }}
       - name: Set up Cloud SDK
         uses: google-github-actions/setup-gcloud@v1
       - name: Run cleanup
-        run:  |
+        run: |
           ./scripts/bootstrap-project.sh $GCP_PROJECT $GCP_SERVICE_ACCOUNT
           ./scripts/cleanup-project.sh $GCP_PROJECT $GCP_FOLDER_ID
       # run tests
       - name: Run integration tests
         # Add the -vvv flag to print out more output
-        run: ansible-test integration -v --color --python 3.9 --venv-system-site-packages
+        run: ansible-test integration -v --color --python 3.9 --venv-system-site-packages
diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
@@ -1,4 +1,5 @@
-name: "Run tests for the cloud.google collection"
+---
+name: Run tests for the cloud.google collection
 on: [pull_request]
 env:
   PYTHON_VERSION: "3.9" # minimum version for Ansible 2.15
@@ -12,6 +13,7 @@ jobs:
       matrix:
         ansible_version:
           - stable-2.14
+          - stable-2.15
     steps:
       - name: check out code
         uses: actions/checkout@v4
@@ -36,7 +38,7 @@ jobs:
         # validate-modules cannot be turned on until #498 is resolved.
         run: ansible-test sanity -v --color --skip validate-modules
       - name: Install ansible-lint
-        run: pip install ansible-lint==6.13.1
+        run: pip install ansible-lint==6.22.0
       - name: Run ansible-lint
         run: ansible-lint
   unit:
@@ -48,7 +50,7 @@ jobs:
       matrix:
         ansible_version:
           - stable-2.14
-          - stable-2.11
+          - stable-2.15
     steps:
       - name: check out code
         uses: actions/checkout@v4
@@ -57,12 +59,12 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "${{ env.PYTHON_VERSION }}"
+          python-version: ${{ env.PYTHON_VERSION }}
       - name: Install dependencies
         run: pip install -r requirements.txt
       - name: Install test dependencies
         run: pip install -r requirements-test.txt
       - name: Install ansible-base (${{ matrix.ansible_version }})
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible_version }}.tar.gz --disable-pip-version-check
       - name: Run unit tests
-        run: ansible-test units -v --color --python "$PYTHON_VERSION"
+        run: ansible-test units -v --color --python "$PYTHON_VERSION"
diff --git a/.github/workflows/automationhub.yml b/.github/workflows/automationhub.yml
@@ -1,9 +1,9 @@
+---
 name: Upload release to Automation Hub
 
 on:
   release:
     types: [created]
-
 jobs:
   deploy:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/gcloud.yml b/.github/workflows/gcloud.yml
@@ -1,15 +1,16 @@
-name: "google.cloud.gcloud"
+---
+name: google.cloud.gcloud
 on:
   push:
     paths:
-      - 'roles/gcloud/**'
-      - '.github/workflows/gcloud.yml'
-      - 'molecule/gcloud/**'
+      - roles/gcloud/**
+      - .github/workflows/gcloud.yml
+      - molecule/gcloud/**
   pull_request:
     paths:
-      - 'roles/gcloud/**'
-      - '.github/workflows/gcloud.yml'
-      - 'molecule/gcloud/**'
+      - roles/gcloud/**
+      - .github/workflows/gcloud.yml
+      - molecule/gcloud/**
 jobs:
   molecule:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/gcsfuse.yml b/.github/workflows/gcsfuse.yml
@@ -1,4 +1,5 @@
-name: "google.cloud.gcsfuse"
+---
+name: google.cloud.gcsfuse
 on:
   push:
     paths:

diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml
@@ -1,9 +1,9 @@
+---
 name: Upload release to Galaxy
 
 on:
   release:
     types: [created]
-
 jobs:
   deploy:
     runs-on: ubuntu-latest

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -21,7 +21,7 @@ git clone <url> $TARGET_DIR/ansible_collections/google/cloud
 Then set up your Python virtual environment:
 
 ```shell
-cd $TARGET_DIR/ansible_collections/google
+cd $TARGET_DIR/ansible_collections/google/cloud
 python3 -m venv venv
 . ./venv/bin/activate
 pip3 install -r requirements.txt