diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01532f28..e98f925c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,7 @@ jobs: strategy: matrix: python_version: ['3.7'] + ansible_version: ['stable-2.11', 'stable-2.10', 'stable-2.9', 'devel'] steps: - name: Check out code uses: actions/checkout@v2 @@ -26,11 +27,15 @@ jobs: with: python-version: ${{ matrix.python_version }} - - name: Install ansible base (devel branch) - run: pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check + - name: Check ansible version + uses: actions/checkout@v2 + with: + repository: ansible/ansible + ref: ${{ matrix.ansible_version }} + path: ansible_collections/kubernetes/core/ansible - name: Run sanity tests on Python ${{ matrix.python_version }} - run: make test-sanity PYTHON_VERSION=${{ matrix.python_version }} + run: source ./ansible/hacking/env-setup && make test-sanity PYTHON_VERSION=${{ matrix.python_version }} working-directory: ./ansible_collections/kubernetes/core integration: @@ -102,7 +107,6 @@ jobs: # run: | # pip uninstall -y ansible # pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check - - name: Create default collection path symlink run: | mkdir -p /home/runner/.ansible diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt index 728285d1..986bb10a 100644 --- a/tests/sanity/ignore-2.10.txt +++ b/tests/sanity/ignore-2.10.txt @@ -8,11 +8,8 @@ molecule/default/roles/helm/files/appversionless-chart-v2/templates/configmap.ya molecule/default/roles/helm/files/appversionless-chart/templates/configmap.yaml yamllint!skip molecule/default/roles/helm/files/test-chart-v2/templates/configmap.yaml yamllint!skip molecule/default/roles/helm/files/test-chart/templates/configmap.yaml yamllint!skip -plugins/module_utils/k8sdynamicclient.py import-2.7!skip plugins/module_utils/k8sdynamicclient.py import-3.7!skip -plugins/module_utils/client/discovery.py import-2.7!skip plugins/module_utils/client/discovery.py import-3.7!skip -plugins/module_utils/client/resource.py import-2.7!skip plugins/module_utils/client/resource.py import-3.7!skip plugins/module_utils/client/discovery.py future-import-boilerplate!skip plugins/module_utils/client/discovery.py metaclass-boilerplate!skip diff --git a/tests/sanity/ignore-2.11.txt b/tests/sanity/ignore-2.11.txt index 728285d1..986bb10a 100644 --- a/tests/sanity/ignore-2.11.txt +++ b/tests/sanity/ignore-2.11.txt @@ -8,11 +8,8 @@ molecule/default/roles/helm/files/appversionless-chart-v2/templates/configmap.ya molecule/default/roles/helm/files/appversionless-chart/templates/configmap.yaml yamllint!skip molecule/default/roles/helm/files/test-chart-v2/templates/configmap.yaml yamllint!skip molecule/default/roles/helm/files/test-chart/templates/configmap.yaml yamllint!skip -plugins/module_utils/k8sdynamicclient.py import-2.7!skip plugins/module_utils/k8sdynamicclient.py import-3.7!skip -plugins/module_utils/client/discovery.py import-2.7!skip plugins/module_utils/client/discovery.py import-3.7!skip -plugins/module_utils/client/resource.py import-2.7!skip plugins/module_utils/client/resource.py import-3.7!skip plugins/module_utils/client/discovery.py future-import-boilerplate!skip plugins/module_utils/client/discovery.py metaclass-boilerplate!skip diff --git a/tests/sanity/ignore-2.12.txt b/tests/sanity/ignore-2.12.txt index 8b748a40..2be297c2 100644 --- a/tests/sanity/ignore-2.12.txt +++ b/tests/sanity/ignore-2.12.txt @@ -8,11 +8,8 @@ molecule/default/roles/helm/files/appversionless-chart-v2/templates/configmap.ya molecule/default/roles/helm/files/appversionless-chart/templates/configmap.yaml yamllint!skip molecule/default/roles/helm/files/test-chart-v2/templates/configmap.yaml yamllint!skip molecule/default/roles/helm/files/test-chart/templates/configmap.yaml yamllint!skip -plugins/module_utils/k8sdynamicclient.py import-2.7!skip plugins/module_utils/k8sdynamicclient.py import-3.7!skip -plugins/module_utils/client/discovery.py import-2.7!skip plugins/module_utils/client/discovery.py import-3.7!skip -plugins/module_utils/client/resource.py import-2.7!skip plugins/module_utils/client/resource.py import-3.7!skip plugins/module_utils/client/discovery.py future-import-boilerplate!skip plugins/module_utils/client/discovery.py metaclass-boilerplate!skip diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt index 83482030..3a99de7b 100644 --- a/tests/sanity/ignore-2.9.txt +++ b/tests/sanity/ignore-2.9.txt @@ -5,8 +5,9 @@ molecule/default/roles/helm/files/appversionless-chart-v2/templates/configmap.ya molecule/default/roles/helm/files/appversionless-chart/templates/configmap.yaml yamllint!skip molecule/default/roles/helm/files/test-chart-v2/templates/configmap.yaml yamllint!skip molecule/default/roles/helm/files/test-chart/templates/configmap.yaml yamllint!skip -plugins/module_utils/k8sdynamicclient.py import-2.7!skip plugins/module_utils/k8sdynamicclient.py import-3.7!skip +plugins/module_utils/client/discovery.py import-3.7!skip +plugins/module_utils/client/resource.py import-3.7!skip plugins/module_utils/client/discovery.py future-import-boilerplate!skip plugins/module_utils/client/discovery.py metaclass-boilerplate!skip tests/unit/module_utils/test_discoverer.py future-import-boilerplate!skip