From 38b7c80217c4e72b1d8988eb1e60bb6e77334114 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 18 Apr 2024 07:52:22 +0200 Subject: Adding upstream version 9.4.0+dfsg. Signed-off-by: Daniel Baumann --- .../docker/.github/workflows/ansible-test.yml | 74 ++++++++++++++++++++-- .../community/docker/.github/workflows/docs-pr.yml | 1 + .../docker/.github/workflows/docs-push.yml | 1 + .../community/docker/.github/workflows/ee.yml | 8 ++- .../docker/.github/workflows/import-galaxy.yml | 20 ++++++ .../community/docker/.github/workflows/reuse.yml | 11 +--- 6 files changed, 98 insertions(+), 17 deletions(-) create mode 100644 ansible_collections/community/docker/.github/workflows/import-galaxy.yml (limited to 'ansible_collections/community/docker/.github') diff --git a/ansible_collections/community/docker/.github/workflows/ansible-test.yml b/ansible_collections/community/docker/.github/workflows/ansible-test.yml index 6aa69f015..d8910d9f6 100644 --- a/ansible_collections/community/docker/.github/workflows/ansible-test.yml +++ b/ansible_collections/community/docker/.github/workflows/ansible-test.yml @@ -31,6 +31,7 @@ jobs: ansible: - '2.11' - '2.12' + - '2.13' # 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 @@ -49,6 +50,8 @@ jobs: coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }} pull-request-change-detection: 'true' testing-type: sanity + pre-test-cmd: >- + git clone --depth=1 --single-branch --branch stable-1 https://github.com/ansible-collections/community.library_inventory_filtering.git ../../community/library_inventory_filtering_v1 units: # Ansible-test on various stable branches does not yet work well with cgroups v2. @@ -68,11 +71,10 @@ jobs: ansible: - '2.11' - '2.12' + - '2.13' steps: - - name: >- - Perform unit testing against - Ansible version ${{ matrix.ansible }} + - name: Perform unit testing against Ansible version ${{ matrix.ansible }} uses: felixfontein/ansible-test-gh-action@main with: ansible-core-github-repository-slug: ${{ contains(fromJson('["2.10", "2.11"]'), matrix.ansible) && 'felixfontein/ansible' || 'ansible/ansible' }} @@ -80,6 +82,8 @@ jobs: coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }} pull-request-change-detection: 'true' testing-type: units + pre-test-cmd: >- + git clone --depth=1 --single-branch --branch stable-1 https://github.com/ansible-collections/community.library_inventory_filtering.git ../../community/library_inventory_filtering_v1 integration: # Ansible-test on various stable branches does not yet work well with cgroups v2. @@ -119,6 +123,10 @@ jobs: docker: fedora32 python: '' target: azp/5/ + - ansible: '2.11' + docker: fedora32 + python: '' + target: azp/6/ - ansible: '2.11' docker: alpine3 python: '' @@ -128,6 +136,10 @@ jobs: docker: alpine3 python: '' target: azp/5/ + - ansible: '2.11' + docker: alpine3 + python: '' + target: azp/6/ # 2.12 - ansible: '2.12' docker: fedora33 @@ -137,6 +149,10 @@ jobs: docker: fedora33 python: '' target: azp/5/ + - ansible: '2.12' + docker: fedora33 + python: '' + target: azp/6/ - ansible: '2.12' docker: fedora34 python: '' @@ -145,6 +161,10 @@ jobs: docker: fedora34 python: '' target: azp/5/ + - ansible: '2.12' + docker: fedora34 + python: '' + target: azp/6/ - ansible: '2.12' docker: ubuntu1804 python: '' @@ -153,12 +173,50 @@ jobs: docker: ubuntu1804 python: '' target: azp/5/ + - ansible: '2.12' + docker: ubuntu1804 + python: '' + target: azp/6/ + # 2.13 + - ansible: '2.13' + docker: fedora35 + python: '' + target: azp/4/ + - ansible: '2.13' + docker: fedora35 + python: '' + target: azp/5/ + - ansible: '2.13' + docker: fedora35 + python: '' + target: azp/6/ + - ansible: '2.13' + docker: opensuse15py2 + python: '' + target: azp/4/ + - ansible: '2.13' + docker: opensuse15py2 + python: '' + target: azp/5/ + - ansible: '2.13' + docker: opensuse15py2 + python: '' + target: azp/6/ + - ansible: '2.13' + docker: alpine3 + python: '' + target: azp/4/ + - ansible: '2.13' + docker: alpine3 + python: '' + target: azp/5/ + - ansible: '2.13' + docker: alpine3 + python: '' + target: azp/6/ steps: - - name: >- - Perform integration testing against - Ansible version ${{ matrix.ansible }} - under Python ${{ matrix.python }} + - name: Perform integration testing against Ansible version ${{ matrix.ansible }} under Python ${{ matrix.python }} uses: felixfontein/ansible-test-gh-action@main with: ansible-core-github-repository-slug: ${{ contains(fromJson('["2.10", "2.11"]'), matrix.ansible) && 'felixfontein/ansible' || 'ansible/ansible' }} @@ -176,6 +234,8 @@ jobs: git clone --depth=1 --single-branch https://github.com/ansible-collections/community.crypto.git ../../community/crypto ; git clone --depth=1 --single-branch https://github.com/ansible-collections/community.general.git ../../community/general + ; + git clone --depth=1 --single-branch --branch stable-1 https://github.com/ansible-collections/community.library_inventory_filtering.git ../../community/library_inventory_filtering_v1 ${{ matrix.extra-constraints && format('; echo ''{0}'' >> tests/utils/constraints.txt', matrix.extra-constraints) || '' }} ; cat tests/utils/constraints.txt diff --git a/ansible_collections/community/docker/.github/workflows/docs-pr.yml b/ansible_collections/community/docker/.github/workflows/docs-pr.yml index c63bdbfc6..74aad8825 100644 --- a/ansible_collections/community/docker/.github/workflows/docs-pr.yml +++ b/ansible_collections/community/docker/.github/workflows/docs-pr.yml @@ -32,6 +32,7 @@ jobs: 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 }}/$)' + extra-collections: community.library_inventory_filtering_v1 publish-docs-gh-pages: # for now we won't run this on forks diff --git a/ansible_collections/community/docker/.github/workflows/docs-push.yml b/ansible_collections/community/docker/.github/workflows/docs-push.yml index ccc320850..8ed0d874b 100644 --- a/ansible_collections/community/docker/.github/workflows/docs-push.yml +++ b/ansible_collections/community/docker/.github/workflows/docs-push.yml @@ -37,6 +37,7 @@ jobs: init-html-short-title: Community.Docker Collection Docs init-extra-html-theme-options: | documentation_home_url=https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/branch/main/ + extra-collections: community.library_inventory_filtering_v1 publish-docs-gh-pages: # for now we won't run this on forks diff --git a/ansible_collections/community/docker/.github/workflows/ee.yml b/ansible_collections/community/docker/.github/workflows/ee.yml index 2b2675b0c..d884f56ef 100644 --- a/ansible_collections/community/docker/.github/workflows/ee.yml +++ b/ansible_collections/community/docker/.github/workflows/ee.yml @@ -46,6 +46,10 @@ jobs: - name: ansible-core devel @ RHEL UBI 9 ansible_core: https://github.com/ansible/ansible/archive/devel.tar.gz ansible_runner: ansible-runner + other_deps: |2 + python_interpreter: + package_system: python3.11 python3.11-pip python3.11-wheel python3.11-cryptography + python_path: "/usr/bin/python3.11" base_image: docker.io/redhat/ubi9:latest pre_base: '"#"' - name: ansible-core 2.15 @ Rocky Linux 9 @@ -77,12 +81,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ansible_collections/${{ env.NAMESPACE }}/${{ env.COLLECTION_NAME }} - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.11' diff --git a/ansible_collections/community/docker/.github/workflows/import-galaxy.yml b/ansible_collections/community/docker/.github/workflows/import-galaxy.yml new file mode 100644 index 000000000..0c0ee402a --- /dev/null +++ b/ansible_collections/community/docker/.github/workflows/import-galaxy.yml @@ -0,0 +1,20 @@ +--- +# 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: import-galaxy +'on': + # Run CI against all pushes (direct commits, also merged PRs) to main, and all Pull Requests + push: + branches: + - main + - stable-* + pull_request: + +jobs: + import-galaxy: + permissions: + contents: read + name: Test to import built collection artifact with Galaxy importer + uses: ansible-community/github-action-test-galaxy-import/.github/workflows/test-galaxy-import.yml@main diff --git a/ansible_collections/community/docker/.github/workflows/reuse.yml b/ansible_collections/community/docker/.github/workflows/reuse.yml index 8d9ebde8d..8064af149 100644 --- a/ansible_collections/community/docker/.github/workflows/reuse.yml +++ b/ansible_collections/community/docker/.github/workflows/reuse.yml @@ -21,12 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - name: Install dependencies - run: | - pip install reuse - - - name: Check REUSE compliance - run: | - reuse lint + - name: REUSE Compliance Check + uses: fsfe/reuse-action@v3 -- cgit v1.2.3