Skip to content

Commit fadb559

Browse files
authored
Upgrade minimum Ansible version to v2.14 and test against Ansible v2.14 and v2.15
chore: bump ansible versions
2 parents cd881b4 + 2ca4ecc commit fadb559

File tree

342 files changed

+4464
-4371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

342 files changed

+4464
-4371
lines changed

.github/workflows/ansible-integration-tests.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
name: "Run integration tests for the cloud.google collection"
1+
---
2+
name: Run integration tests for the cloud.google collection
23
on:
34
pull_request: {}
45
push:
56
branches: master
67
env:
7-
GCP_SERVICE_ACCOUNT: "[email protected]"
8-
GCP_PROJECT: "ansible-gcp-ci"
8+
GCP_SERVICE_ACCOUNT: [email protected]
9+
GCP_PROJECT: ansible-gcp-ci
910
GCP_FOLDER_ID: "542027184392"
1011
jobs:
1112
integration:
@@ -18,9 +19,11 @@ jobs:
1819
run:
1920
working-directory: ansible_collections/google/cloud
2021
strategy:
22+
max-parallel: 1
2123
matrix:
2224
ansible_version:
23-
- stable-2.13
25+
- stable-2.14
26+
- stable-2.15
2427
steps:
2528
- name: check out code
2629
uses: actions/checkout@v4
@@ -53,15 +56,15 @@ jobs:
5356
env:
5457
CI_SERVICE_ACCOUNT_FILE_CONTENTS: ${{ secrets.CI_SERVICE_ACCOUNT_FILE_CONTENTS }}
5558
with:
56-
service_account: "$GCP_SERVICE_ACCOUNT"
57-
credentials_json: "${{ secrets.CI_SERVICE_ACCOUNT_FILE_CONTENTS }}"
59+
service_account: $GCP_SERVICE_ACCOUNT
60+
credentials_json: ${{ secrets.CI_SERVICE_ACCOUNT_FILE_CONTENTS }}
5861
- name: Set up Cloud SDK
5962
uses: google-github-actions/setup-gcloud@v1
6063
- name: Run cleanup
61-
run: |
64+
run: |
6265
./scripts/bootstrap-project.sh $GCP_PROJECT $GCP_SERVICE_ACCOUNT
6366
./scripts/cleanup-project.sh $GCP_PROJECT $GCP_FOLDER_ID
6467
# run tests
6568
- name: Run integration tests
6669
# Add the -vvv flag to print out more output
67-
run: ansible-test integration -v --color --python 3.9 --venv-system-site-packages
70+
run: ansible-test integration -v --color --python 3.9 --venv-system-site-packages

.github/workflows/ansible-test.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
name: "Run tests for the cloud.google collection"
1+
---
2+
name: Run tests for the cloud.google collection
23
on: [pull_request]
34
env:
45
PYTHON_VERSION: "3.9" # minimum version for Ansible 2.15
@@ -12,6 +13,7 @@ jobs:
1213
matrix:
1314
ansible_version:
1415
- stable-2.14
16+
- stable-2.15
1517
steps:
1618
- name: check out code
1719
uses: actions/checkout@v4
@@ -36,7 +38,7 @@ jobs:
3638
# validate-modules cannot be turned on until #498 is resolved.
3739
run: ansible-test sanity -v --color --skip validate-modules
3840
- name: Install ansible-lint
39-
run: pip install ansible-lint==6.13.1
41+
run: pip install ansible-lint==6.22.0
4042
- name: Run ansible-lint
4143
run: ansible-lint
4244
unit:
@@ -48,7 +50,7 @@ jobs:
4850
matrix:
4951
ansible_version:
5052
- stable-2.14
51-
- stable-2.11
53+
- stable-2.15
5254
steps:
5355
- name: check out code
5456
uses: actions/checkout@v4
@@ -57,12 +59,12 @@ jobs:
5759
- name: Set up Python
5860
uses: actions/setup-python@v4
5961
with:
60-
python-version: "${{ env.PYTHON_VERSION }}"
62+
python-version: ${{ env.PYTHON_VERSION }}
6163
- name: Install dependencies
6264
run: pip install -r requirements.txt
6365
- name: Install test dependencies
6466
run: pip install -r requirements-test.txt
6567
- name: Install ansible-base (${{ matrix.ansible_version }})
6668
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible_version }}.tar.gz --disable-pip-version-check
6769
- name: Run unit tests
68-
run: ansible-test units -v --color --python "$PYTHON_VERSION"
70+
run: ansible-test units -v --color --python "$PYTHON_VERSION"

.github/workflows/automationhub.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
---
12
name: Upload release to Automation Hub
23

34
on:
45
release:
56
types: [created]
6-
77
jobs:
88
deploy:
99
runs-on: ubuntu-latest

.github/workflows/gcloud.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
name: "google.cloud.gcloud"
1+
---
2+
name: google.cloud.gcloud
23
on:
34
push:
45
paths:
5-
- 'roles/gcloud/**'
6-
- '.github/workflows/gcloud.yml'
7-
- 'molecule/gcloud/**'
6+
- roles/gcloud/**
7+
- .github/workflows/gcloud.yml
8+
- molecule/gcloud/**
89
pull_request:
910
paths:
10-
- 'roles/gcloud/**'
11-
- '.github/workflows/gcloud.yml'
12-
- 'molecule/gcloud/**'
11+
- roles/gcloud/**
12+
- .github/workflows/gcloud.yml
13+
- molecule/gcloud/**
1314
jobs:
1415
molecule:
1516
runs-on: ubuntu-latest

.github/workflows/gcsfuse.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
name: "google.cloud.gcsfuse"
1+
---
2+
name: google.cloud.gcsfuse
23
on:
34
push:
45
paths:

.github/workflows/pythonpublish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
---
12
name: Upload release to Galaxy
23

34
on:
45
release:
56
types: [created]
6-
77
jobs:
88
deploy:
99
runs-on: ubuntu-latest

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ git clone <url> $TARGET_DIR/ansible_collections/google/cloud
2121
Then set up your Python virtual environment:
2222

2323
```shell
24-
cd $TARGET_DIR/ansible_collections/google
24+
cd $TARGET_DIR/ansible_collections/google/cloud
2525
python3 -m venv venv
2626
. ./venv/bin/activate
2727
pip3 install -r requirements.txt

0 commit comments

Comments
 (0)