From 7b73f7e4d7757b42395b36032d4435fab73ff3e5 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 20 Dec 2022 22:28:39 +0100 Subject: [PATCH] Show timings with devel, and skip everything else. --- .azure-pipelines/azure-pipelines.yml | 205 +---------------------- .github/workflows/ansible-test.yml | 192 --------------------- .github/workflows/docs-pr.yml | 92 ---------- .github/workflows/docs-push.yml | 52 ------ .github/workflows/ee.yml | 113 ------------- .github/workflows/reuse.yml | 34 ---- tests/utils/shippable/generic.sh | 2 +- tests/utils/shippable/linux-community.sh | 2 +- tests/utils/shippable/linux.sh | 2 +- tests/utils/shippable/remote.sh | 2 +- tests/utils/shippable/shippable.sh | 2 +- 11 files changed, 9 insertions(+), 689 deletions(-) delete mode 100644 .github/workflows/ansible-test.yml delete mode 100644 .github/workflows/docs-pr.yml delete mode 100644 .github/workflows/docs-push.yml delete mode 100644 .github/workflows/ee.yml delete mode 100644 .github/workflows/reuse.yml diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index c8e22c6b..96388465 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -51,53 +51,6 @@ resources: pool: Standard stages: -### Sanity & units - - stage: Ansible_devel - displayName: Sanity & Units devel - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - targets: - - name: Sanity - test: 'devel/sanity/1' - - name: Sanity Extra # Only on devel - test: 'devel/sanity/extra' - - name: Units - test: 'devel/units/1' - - stage: Ansible_2_14 - displayName: Sanity & Units 2.14 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - targets: - - name: Sanity - test: '2.14/sanity/1' - - name: Units - test: '2.14/units/1' - - stage: Ansible_2_13 - displayName: Sanity & Units 2.13 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - targets: - - name: Sanity - test: '2.13/sanity/1' - - name: Units - test: '2.13/units/1' - - stage: Ansible_2_12 - displayName: Sanity & Units 2.12 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - targets: - - name: Sanity - test: '2.12/sanity/1' - - name: Units - test: '2.12/units/1' ### Docker - stage: Docker_devel displayName: Docker devel @@ -115,62 +68,13 @@ stages: test: opensuse15 - name: Ubuntu 20.04 test: ubuntu2004 - # - name: Ubuntu 22.04 - # test: ubuntu2204 - - name: Alpine 3 - test: alpine3 - groups: - - 1 - - 2 - - stage: Docker_2_14 - displayName: Docker 2.14 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.14/linux/{0} - targets: - name: Ubuntu 22.04 test: ubuntu2204 - groups: - - 1 - - 2 - - stage: Docker_2_13 - displayName: Docker 2.13 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.13/linux/{0} - targets: - - name: openSUSE 15 py2 - test: opensuse15py2 - - name: Fedora 35 - test: fedora35 - - name: Fedora 34 - test: fedora34 - - name: Ubuntu 18.04 - test: ubuntu1804 - name: Alpine 3 test: alpine3 groups: - 1 - 2 - - stage: Docker_2_12 - displayName: Docker 2.12 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.12/linux/{0} - targets: - - name: CentOS 6 - test: centos6 - - name: Fedora 33 - test: fedora33 - groups: - - 1 - - 2 ### Community Docker - stage: Docker_community_devel @@ -206,8 +110,8 @@ stages: test: macos/12.0 - name: RHEL 7.9 test: rhel/7.9 - # - name: RHEL 9.0 - # test: rhel/9.0 + - name: RHEL 9.0 + test: rhel/9.0 - name: FreeBSD 12.3 test: freebsd/12.3 - name: FreeBSD 13.1 @@ -215,54 +119,6 @@ stages: groups: - 1 - 2 - - stage: Remote_2_14 - displayName: Remote 2.14 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.14/{0} - targets: - - name: RHEL 9.0 - test: rhel/9.0 - groups: - - 1 - - 2 - - stage: Remote_2_13 - displayName: Remote 2.13 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.13/{0} - targets: - # - name: macOS 12.0 - # test: macos/12.0 - - name: RHEL 8.5 - test: rhel/8.5 - - name: FreeBSD 13.0 - test: freebsd/13.0 - groups: - - 1 - - 2 - - stage: Remote_2_12 - displayName: Remote 2.12 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.12/{0} - targets: - # Not working anymore: - # - name: macOS 11.1 - # test: macos/11.1 - - name: RHEL 8.4 - test: rhel/8.4 - - name: FreeBSD 12.2 - test: freebsd/12.2 - groups: - - 1 - - 2 ### Generic - stage: Generic_devel displayName: Generic devel @@ -277,75 +133,22 @@ stages: - test: 3.5 - test: 3.6 - test: 3.7 - # - test: 3.8 - # - test: 3.9 + - test: 3.8 + - test: 3.9 - test: "3.10" - test: "3.11" groups: - 1 - 2 - - stage: Generic_2_14 - displayName: Generic 2.14 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Python {0} - testFormat: 2.14/generic/{0} - targets: - - test: 3.9 - groups: - - 1 - - 2 - - stage: Generic_2_13 - displayName: Generic 2.13 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Python {0} - testFormat: 2.13/generic/{0} - targets: - - test: 3.8 - groups: - - 1 - - 2 - - stage: Generic_2_12 - displayName: Generic 2.12 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Python {0} - testFormat: 2.12/generic/{0} - targets: - - test: 2.6 - - test: 3.9 - groups: - - 1 - - 2 ## Finally - stage: Summary condition: succeededOrFailed() dependsOn: - - Ansible_devel - - Ansible_2_14 - - Ansible_2_13 - - Ansible_2_12 - Remote_devel - - Remote_2_14 - - Remote_2_13 - - Remote_2_12 - Docker_devel - - Docker_2_14 - - Docker_2_13 - - Docker_2_12 - Docker_community_devel - Generic_devel - - Generic_2_14 - - Generic_2_13 - - Generic_2_12 jobs: - template: templates/coverage.yml diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml deleted file mode 100644 index 2b6d8526..00000000 --- a/.github/workflows/ansible-test.yml +++ /dev/null @@ -1,192 +0,0 @@ ---- -# Copyright (c) Ansible Project -# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) -# SPDX-License-Identifier: GPL-3.0-or-later - -# For the comprehensive list of the inputs supported by the ansible-community/ansible-test-gh-action GitHub Action, see -# https://github.com/marketplace/actions/ansible-test - -name: EOL CI -on: - # Run EOL CI against all pushes (direct commits, also merged PRs), Pull Requests - push: - branches: - - main - - stable-* - pull_request: - # Run EOL CI once per day (at 09:00 UTC) - schedule: - - cron: '0 9 * * *' - -jobs: - sanity: - name: EOL Sanity (Ⓐ${{ matrix.ansible }}) - strategy: - matrix: - ansible: - - '2.9' - - '2.10' - - '2.11' - # Ansible-test on various stable branches does not yet work well with cgroups v2. - # Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04 - # image for these stable branches. The list of branches where this is necessary will - # shrink over time, check out https://github.com/ansible-collections/news-for-maintainers/issues/28 - # for the latest list. - runs-on: >- - ${{ contains(fromJson( - '["2.9", "2.10", "2.11"]' - ), matrix.ansible) && 'ubuntu-20.04' || 'ubuntu-latest' }} - steps: - - name: Perform sanity testing - uses: felixfontein/ansible-test-gh-action@main - with: - ansible-core-version: stable-${{ matrix.ansible }} - coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }} - pull-request-change-detection: 'true' - testing-type: sanity - - units: - # Ansible-test on various stable branches does not yet work well with cgroups v2. - # Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04 - # image for these stable branches. The list of branches where this is necessary will - # shrink over time, check out https://github.com/ansible-collections/news-for-maintainers/issues/28 - # for the latest list. - runs-on: >- - ${{ contains(fromJson( - '["2.9", "2.10", "2.11"]' - ), matrix.ansible) && 'ubuntu-20.04' || 'ubuntu-latest' }} - name: EOL Units (Ⓐ${{ matrix.ansible }}) - strategy: - # As soon as the first unit test fails, cancel the others to free up the CI queue - fail-fast: true - matrix: - ansible: - - '2.9' - - '2.10' - - '2.11' - - steps: - - name: >- - Perform unit testing against - Ansible version ${{ matrix.ansible }} - uses: felixfontein/ansible-test-gh-action@main - with: - ansible-core-version: stable-${{ matrix.ansible }} - coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }} - pull-request-change-detection: 'true' - testing-type: units - - integration: - # Ansible-test on various stable branches does not yet work well with cgroups v2. - # Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04 - # image for these stable branches. The list of branches where this is necessary will - # shrink over time, check out https://github.com/ansible-collections/news-for-maintainers/issues/28 - # for the latest list. - runs-on: >- - ${{ contains(fromJson( - '["2.9", "2.10", "2.11"]' - ), matrix.ansible) && 'ubuntu-20.04' || 'ubuntu-latest' }} - name: EOL I (Ⓐ${{ matrix.ansible }}+${{ matrix.docker }}+py${{ matrix.python }}:${{ matrix.target }}) - strategy: - fail-fast: false - matrix: - ansible: - - '' - docker: - - '' - python: - - '' - target: - - '' - exclude: - - ansible: '' - include: - # 2.9 - - ansible: '2.9' - docker: fedora31 - python: '' - target: azp/posix/1/ - - ansible: '2.9' - docker: fedora31 - python: '' - target: azp/posix/2/ - - ansible: '2.9' - docker: ubuntu1804 - python: '' - target: azp/posix/1/ - - ansible: '2.9' - docker: ubuntu1804 - python: '' - target: azp/posix/2/ - - ansible: '2.9' - docker: default - python: '2.7' - target: azp/generic/1/ - - ansible: '2.9' - docker: default - python: '2.7' - target: azp/generic/2/ - # 2.10 - - ansible: '2.10' - docker: centos6 - python: '' - target: azp/posix/1/ - - ansible: '2.10' - docker: centos6 - python: '' - target: azp/posix/2/ - - ansible: '2.10' - docker: default - python: '3.6' - target: azp/generic/1/ - - ansible: '2.10' - docker: default - python: '3.6' - target: azp/generic/2/ - # 2.11 - - ansible: '2.11' - docker: fedora32 - python: '' - target: azp/posix/1/ - - ansible: '2.11' - docker: fedora32 - python: '' - target: azp/posix/2/ - - ansible: '2.11' - docker: alpine3 - python: '' - target: azp/posix/1/ - - ansible: '2.11' - docker: alpine3 - python: '' - target: azp/posix/2/ - - ansible: '2.11' - docker: default - python: '3.8' - target: azp/generic/1/ - - ansible: '2.11' - docker: default - python: '3.8' - target: azp/generic/2/ - - steps: - - name: >- - Perform integration testing against - Ansible version ${{ matrix.ansible }} - under Python ${{ matrix.python }} - uses: felixfontein/ansible-test-gh-action@main - with: - ansible-core-version: stable-${{ matrix.ansible }} - coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }} - docker-image: ${{ matrix.docker }} - integration-continue-on-error: 'false' - integration-diff: 'false' - integration-retry-on-error: 'true' - pre-test-cmd: >- - git clone --depth=1 --single-branch https://github.com/ansible-collections/community.internal_test_tools.git ../../community/internal_test_tools - ; - git clone --depth=1 --single-branch https://github.com/ansible-collections/community.general.git ../../community/general - pull-request-change-detection: 'true' - target: ${{ matrix.target }} - target-python-version: ${{ matrix.python }} - testing-type: integration diff --git a/.github/workflows/docs-pr.yml b/.github/workflows/docs-pr.yml deleted file mode 100644 index e55c30a6..00000000 --- a/.github/workflows/docs-pr.yml +++ /dev/null @@ -1,92 +0,0 @@ ---- -# Copyright (c) Ansible Project -# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) -# SPDX-License-Identifier: GPL-3.0-or-later - -name: Collection Docs -concurrency: - group: docs-pr-${{ github.head_ref }} - cancel-in-progress: true -on: - pull_request_target: - types: [opened, synchronize, reopened, closed] - -env: - GHP_BASE_URL: https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }} - -jobs: - build-docs: - permissions: - contents: read - name: Build Ansible Docs - uses: ansible-community/github-docs-build/.github/workflows/_shared-docs-build-pr.yml@main - with: - collection-name: community.crypto - init-lenient: false - init-fail-on-error: true - squash-hierarchy: true - init-project: Community.Crypto Collection - init-copyright: Community.Crypto Contributors - init-title: Community.Crypto Collection Documentation - init-html-short-title: Community.Crypto Collection Docs - init-extra-html-theme-options: | - documentation_home_url=https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/branch/main/ - render-file-line: '> * `$` [$](https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/pr/${{ github.event.number }}/$)' - - publish-docs-gh-pages: - # for now we won't run this on forks - if: github.repository == 'ansible-collections/community.crypto' - permissions: - contents: write - needs: [build-docs] - name: Publish Ansible Docs - uses: ansible-community/github-docs-build/.github/workflows/_shared-docs-build-publish-gh-pages.yml@main - with: - artifact-name: ${{ needs.build-docs.outputs.artifact-name }} - action: ${{ (github.event.action == 'closed' || needs.build-docs.outputs.changed != 'true') && 'teardown' || 'publish' }} - secrets: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - comment: - permissions: - pull-requests: write - runs-on: ubuntu-latest - needs: [build-docs, publish-docs-gh-pages] - name: PR comments - steps: - - name: PR comment - uses: ansible-community/github-docs-build/actions/ansible-docs-build-comment@main - with: - body-includes: '## Docs Build' - reactions: heart - action: ${{ needs.build-docs.outputs.changed != 'true' && 'remove' || '' }} - on-closed-body: | - ## Docs Build 📝 - - This PR is closed and any previously published docsite has been unpublished. - on-merged-body: | - ## Docs Build 📝 - - Thank you for contribution!✨ - - This PR has been merged and the docs are now incorporated into `main`: - ${{ env.GHP_BASE_URL }}/branch/main - body: | - ## Docs Build 📝 - - Thank you for contribution!✨ - - The docs for **this PR** have been published here: - ${{ env.GHP_BASE_URL }}/pr/${{ github.event.number }} - - You can compare to the docs for the `main` branch here: - ${{ env.GHP_BASE_URL }}/branch/main - - The docsite for **this PR** is also available for download as an artifact from this run: - ${{ needs.build-docs.outputs.artifact-url }} - - File changes: - - ${{ needs.build-docs.outputs.diff-files-rendered }} - - ${{ needs.build-docs.outputs.diff-rendered }} diff --git a/.github/workflows/docs-push.yml b/.github/workflows/docs-push.yml deleted file mode 100644 index 2c798c78..00000000 --- a/.github/workflows/docs-push.yml +++ /dev/null @@ -1,52 +0,0 @@ ---- -# Copyright (c) Ansible Project -# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) -# SPDX-License-Identifier: GPL-3.0-or-later - -name: Collection Docs -concurrency: - group: docs-push-${{ github.sha }} - cancel-in-progress: true -on: - push: - branches: - - main - - stable-* - tags: - - '*' - # Run CI once per day (at 09:00 UTC) - schedule: - - cron: '0 9 * * *' - # Allow manual trigger (for newer antsibull-docs, sphinx-ansible-theme, ... versions) - workflow_dispatch: - -jobs: - build-docs: - permissions: - contents: read - name: Build Ansible Docs - uses: ansible-community/github-docs-build/.github/workflows/_shared-docs-build-push.yml@main - with: - collection-name: community.crypto - init-lenient: false - init-fail-on-error: true - squash-hierarchy: true - init-project: Community.Crypto Collection - init-copyright: Community.Crypto Contributors - init-title: Community.Crypto Collection Documentation - init-html-short-title: Community.Crypto Collection Docs - init-extra-html-theme-options: | - documentation_home_url=https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/branch/main/ - - publish-docs-gh-pages: - # for now we won't run this on forks - if: github.repository == 'ansible-collections/community.crypto' - permissions: - contents: write - needs: [build-docs] - name: Publish Ansible Docs - uses: ansible-community/github-docs-build/.github/workflows/_shared-docs-build-publish-gh-pages.yml@main - with: - artifact-name: ${{ needs.build-docs.outputs.artifact-name }} - secrets: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ee.yml b/.github/workflows/ee.yml deleted file mode 100644 index 4c275bfc..00000000 --- a/.github/workflows/ee.yml +++ /dev/null @@ -1,113 +0,0 @@ ---- -# Copyright (c) Ansible Project -# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) -# SPDX-License-Identifier: GPL-3.0-or-later - -name: execution environment -on: - # Run CI against all pushes (direct commits, also merged PRs), Pull Requests - push: - branches: - - main - - stable-* - pull_request: - # Run CI once per day (at 04:45 UTC) - # This ensures that even if there haven't been commits that we are still testing against latest version of ansible-builder - schedule: - - cron: '45 4 * * *' - -env: - NAMESPACE: community - COLLECTION_NAME: crypto - -jobs: - build: - name: Build and test EE (Ⓐ${{ matrix.runner_tag }}) - strategy: - matrix: - runner_tag: - - devel - - stable-2.12-latest - - stable-2.11-latest - - stable-2.9-latest - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v3 - with: - path: ansible_collections/${{ env.NAMESPACE }}/${{ env.COLLECTION_NAME }} - - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.10' - - - name: Install ansible-builder and ansible-navigator - run: pip install ansible-builder ansible-navigator - - - name: Verify requirements - run: ansible-builder introspect --sanitize . - - - name: Make sure galaxy.yml has version entry - run: >- - python -c - 'import yaml ; - f = open("galaxy.yml", "rb") ; - data = yaml.safe_load(f) ; - f.close() ; - data["version"] = data.get("version") or "0.0.1" ; - f = open("galaxy.yml", "wb") ; - f.write(yaml.dump(data).encode("utf-8")) ; - f.close() ; - ' - working-directory: ansible_collections/${{ env.NAMESPACE }}/${{ env.COLLECTION_NAME }} - - - name: Build collection - run: | - ansible-galaxy collection build --output-path ../../../ - working-directory: ansible_collections/${{ env.NAMESPACE }}/${{ env.COLLECTION_NAME }} - - - name: Create files for building execution environment - run: | - COLLECTION_FILENAME="$(ls "${{ env.NAMESPACE }}-${{ env.COLLECTION_NAME }}"-*.tar.gz)" - - # EE config - cat > execution-environment.yml < requirements.yml < - ansible-navigator run - --mode stdout - --pull-policy never - --set-environment-variable ANSIBLE_PRIVATE_ROLE_VARS=true - --execution-environment-image test-ee:latest - -v - all.yml - working-directory: ansible_collections/${{ env.NAMESPACE }}/${{ env.COLLECTION_NAME }}/tests/ee diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml deleted file mode 100644 index 3b01cd8a..00000000 --- a/.github/workflows/reuse.yml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# Copyright (c) Ansible Project -# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) -# SPDX-License-Identifier: GPL-3.0-or-later - -name: Verify REUSE - -on: - push: - branches: [main] - pull_request: - branches: [main] - # Run CI once per day (at 04:45 UTC) - schedule: - - cron: '45 4 * * *' - -jobs: - check: - permissions: - contents: read - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - - name: Install dependencies - run: | - pip install reuse - - - name: Check REUSE compliance (except some PEM files) - run: | - rm -f tests/integration/targets/*/files/*.pem - rm -f tests/integration/targets/*/files/roots/*.pem - reuse lint diff --git a/tests/utils/shippable/generic.sh b/tests/utils/shippable/generic.sh index 34532791..7ec7464d 100755 --- a/tests/utils/shippable/generic.sh +++ b/tests/utils/shippable/generic.sh @@ -17,6 +17,6 @@ stage="${S:-prod}" # shellcheck disable=SC2086 export ANSIBLE_ACME_CONTAINER=quay.io/ansible/acme-test-container:2.0.0 # use new container until -ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \ +ansible-test integration --show-timings --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \ --remote-terminate always --remote-stage "${stage}" \ --docker --python "${python}" diff --git a/tests/utils/shippable/linux-community.sh b/tests/utils/shippable/linux-community.sh index 48d0d868..2a8f80a4 100755 --- a/tests/utils/shippable/linux-community.sh +++ b/tests/utils/shippable/linux-community.sh @@ -18,5 +18,5 @@ else fi # shellcheck disable=SC2086 -ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \ +ansible-test integration --show-timings --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \ --docker "quay.io/ansible-community/test-image:${image}" --python "${python}" diff --git a/tests/utils/shippable/linux.sh b/tests/utils/shippable/linux.sh index 6e1e2350..ca73e3a4 100755 --- a/tests/utils/shippable/linux.sh +++ b/tests/utils/shippable/linux.sh @@ -17,5 +17,5 @@ else fi # shellcheck disable=SC2086 -ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \ +ansible-test integration --show-timings --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \ --docker "${image}" diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index b70adf78..e58d7dac 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -31,5 +31,5 @@ stage="${S:-prod}" provider="${P:-default}" # shellcheck disable=SC2086 -ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \ +ansible-test integration --show-timings --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \ --python "${pyver}" --remote "${platform}/${version}" --remote-terminate always --remote-stage "${stage}" --remote-provider "${provider}" diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 52613769..ade4c0af 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -59,7 +59,7 @@ command -v pip pip --version pip list --disable-pip-version-check if [ "${ansible_version}" == "devel" ]; then - retry pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check + retry pip install https://github.com/felixfontein/ansible/archive/integration-timings.tar.gz --disable-pip-version-check else retry pip install "https://github.com/ansible/ansible/archive/stable-${ansible_version}.tar.gz" --disable-pip-version-check fi