diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index b59a14c..b1ad5e2 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -32,7 +32,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v3 with: - python-version: '3.9' + python-version: '3.10' - name: Install ansible-base (${{ matrix.ansible }}) run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check @@ -40,26 +40,18 @@ jobs: - name: Run sanity tests run: ansible-test sanity --docker -v --color --coverage working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}} - - - name: Generate coverage report - run: ansible-test coverage xml -v --requirements --group-by command --group-by version - working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}} - - - uses: codecov/codecov-action@v3 - with: - fail_ci_if_error: false integration: runs-on: ubuntu-latest - name: Integration ${{ matrix.ansible }}-py${{ matrix.python }}) + name: Integration (Ⓐ${{ matrix.ansible }}-py${{ matrix.python }}) strategy: - fail-fast: false + fail-fast: true max-parallel: 1 matrix: ansible: - stable-2.13 python: - - '3.9' + - '3.10' steps: - name: Check out code @@ -80,11 +72,11 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: ${{ matrix.python }} - name: Install ansible-base (${{ matrix.ansible }}) run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check - name: Run integration test run: ansible-test integration -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker --coverage - working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}} + working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}} \ No newline at end of file diff --git a/.github/workflows/full-integration-test.yml b/.github/workflows/full-integration-test.yml index 1732393..c390304 100644 --- a/.github/workflows/full-integration-test.yml +++ b/.github/workflows/full-integration-test.yml @@ -11,9 +11,9 @@ jobs: integration: runs-on: ubuntu-latest - name: ${{ matrix.ansible }}-py${{ matrix.python }}) + name: ${{ matrix.ansible }}-py${{ matrix.python }} strategy: - fail-fast: false + fail-fast: true max-parallel: 1 matrix: ansible: @@ -22,8 +22,7 @@ jobs: - stable-2.11 - stable-2.12 - stable-2.13 - # - devel - # - milestone + - devel python: - '2.7' - '3.5' @@ -31,6 +30,7 @@ jobs: - '3.7' - '3.8' - '3.9' + - '3.10' exclude: - ansible: stable-2.9 python: '3.9' @@ -60,14 +60,11 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: 3.8 - - - name: Install requests - run: pip install requests + python-version: '3.10' - name: Install ansible-base (${{ matrix.ansible }}) run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check - name: Run integration test run: ansible-test integration -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker --coverage - working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}} + working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}} \ No newline at end of file diff --git a/tests/integration/requirements.txt b/tests/integration/requirements.txt new file mode 100644 index 0000000..663bd1f --- /dev/null +++ b/tests/integration/requirements.txt @@ -0,0 +1 @@ +requests \ No newline at end of file