From e12f2693231547d611870b0ea9ffaf60a712acd8 Mon Sep 17 00:00:00 2001 From: Sergey <6213510+sshnaidm@users.noreply.github.com> Date: Thu, 31 Jul 2025 13:54:17 +0300 Subject: [PATCH] Fix Python version in CI for latest Ansible 2.19 (#951) Signed-off-by: Sagi Shnaidman --- .../collection-continuous-integration.yml | 26 +++++++------------ .github/workflows/connections_tests.yml | 17 ++++++------ .github/workflows/podman_container.yml | 13 +++++----- .github/workflows/podman_container_exec.yml | 4 +-- .github/workflows/podman_container_idem.yml | 4 +-- .github/workflows/podman_containers.yml | 4 +-- .github/workflows/podman_secret.yml | 4 +-- .github/workflows/podman_secret_info.yml | 4 +-- ci/playbooks/pre.yml | 6 ++--- 9 files changed, 35 insertions(+), 47 deletions(-) diff --git a/.github/workflows/collection-continuous-integration.yml b/.github/workflows/collection-continuous-integration.yml index e5ff3bd..7659755 100644 --- a/.github/workflows/collection-continuous-integration.yml +++ b/.github/workflows/collection-continuous-integration.yml @@ -57,31 +57,23 @@ jobs: runner-os: - ubuntu-22.04 runner-python-version: - - '3.10' + - '3.11' ansible-version: - - ansible<2.10 - - git+https://github.com/ansible/ansible.git@stable-2.17 + - git+https://github.com/ansible/ansible.git@stable-2.18 - git+https://github.com/ansible/ansible.git@devel python-version: - - '3.10' + - '3.11' include: + - runner-os: ubuntu-22.04 + runner-python-version: '3.12' + ansible-version: git+https://github.com/ansible/ansible.git@devel + python-version: '3.12' + exclude: - runner-os: ubuntu-22.04 runner-python-version: '3.11' ansible-version: git+https://github.com/ansible/ansible.git@devel python-version: '3.11' - - runner-os: ubuntu-22.04 - runner-python-version: 3.8 - ansible-version: ansible<2.10 - python-version: 3.8 - exclude: - - runner-os: ubuntu-22.04 - runner-python-version: '3.10' - ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: '3.10' - - runner-os: ubuntu-22.04 - runner-python-version: '3.10' - ansible-version: ansible<2.10 - python-version: '3.10' + steps: - name: Set up Python ${{ matrix.runner-python-version }} diff --git a/.github/workflows/connections_tests.yml b/.github/workflows/connections_tests.yml index d0612b6..8efd5fb 100644 --- a/.github/workflows/connections_tests.yml +++ b/.github/workflows/connections_tests.yml @@ -77,7 +77,7 @@ jobs: matrix: ansible-version: - ansible<2.10 - - git+https://github.com/ansible/ansible.git@stable-2.17 + - git+https://github.com/ansible/ansible.git@stable-2.18 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 @@ -85,7 +85,7 @@ jobs: #- ubuntu-16.04 #- macos-latest python-version: - - "3.10" + - "3.11" # - 3.9 #- 3.6 #- 3.5 @@ -93,11 +93,11 @@ jobs: include: - os: ubuntu-22.04 ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: "3.11" + python-version: "3.12" exclude: - os: ubuntu-22.04 ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: "3.10" + python-version: "3.11" steps: @@ -174,8 +174,7 @@ jobs: fail-fast: false matrix: ansible-version: - - ansible<2.10 - - git+https://github.com/ansible/ansible.git@stable-2.17 + - git+https://github.com/ansible/ansible.git@stable-2.18 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 @@ -184,18 +183,18 @@ jobs: #- macos-latest python-version: #- 3.9 - - "3.10" + - "3.11" #- 3.6 #- 3.5 #- 2.7 include: - os: ubuntu-22.04 ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: "3.11" + python-version: "3.12" exclude: - os: ubuntu-22.04 ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: "3.10" + python-version: "3.11" steps: diff --git a/.github/workflows/podman_container.yml b/.github/workflows/podman_container.yml index 7123323..b7236a3 100644 --- a/.github/workflows/podman_container.yml +++ b/.github/workflows/podman_container.yml @@ -42,28 +42,27 @@ jobs: fail-fast: false matrix: ansible-version: - - ansible<2.10 - - git+https://github.com/ansible/ansible.git@stable-2.17 + - git+https://github.com/ansible/ansible.git@stable-2.18 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 python-version: - - "3.10" + - "3.11" podman-version: - unstable include: - os: ubuntu-22.04 - ansible-version: git+https://github.com/ansible/ansible.git@stable-2.17 - python-version: "3.10" + ansible-version: git+https://github.com/ansible/ansible.git@stable-2.18 + python-version: "3.11" podman-version: stable - os: ubuntu-22.04 ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: "3.11" + python-version: "3.12" podman-version: unstable exclude: - os: ubuntu-22.04 ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: "3.10" + python-version: "3.11" podman-version: unstable steps: diff --git a/.github/workflows/podman_container_exec.yml b/.github/workflows/podman_container_exec.yml index 6148239..cb492a0 100644 --- a/.github/workflows/podman_container_exec.yml +++ b/.github/workflows/podman_container_exec.yml @@ -35,12 +35,12 @@ jobs: matrix: ansible-version: # - ansible<2.10 - - git+https://github.com/ansible/ansible.git@stable-2.17 + - git+https://github.com/ansible/ansible.git@stable-2.18 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 python-version: - - "3.11" + - "3.12" steps: diff --git a/.github/workflows/podman_container_idem.yml b/.github/workflows/podman_container_idem.yml index f63b440..928e278 100644 --- a/.github/workflows/podman_container_idem.yml +++ b/.github/workflows/podman_container_idem.yml @@ -39,12 +39,12 @@ jobs: matrix: ansible-version: # - ansible<2.10 - - git+https://github.com/ansible/ansible.git@stable-2.17 + - git+https://github.com/ansible/ansible.git@stable-2.18 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 python-version: - - "3.11" + - "3.12" steps: diff --git a/.github/workflows/podman_containers.yml b/.github/workflows/podman_containers.yml index 26a6fd0..c9804fb 100644 --- a/.github/workflows/podman_containers.yml +++ b/.github/workflows/podman_containers.yml @@ -40,12 +40,12 @@ jobs: fail-fast: false matrix: ansible-version: - - git+https://github.com/ansible/ansible.git@stable-2.17 + - git+https://github.com/ansible/ansible.git@stable-2.18 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 python-version: - - "3.11" + - "3.12" steps: diff --git a/.github/workflows/podman_secret.yml b/.github/workflows/podman_secret.yml index 24117af..7b97991 100644 --- a/.github/workflows/podman_secret.yml +++ b/.github/workflows/podman_secret.yml @@ -36,12 +36,12 @@ jobs: fail-fast: false matrix: ansible-version: - - git+https://github.com/ansible/ansible.git@stable-2.17 + - git+https://github.com/ansible/ansible.git@stable-2.18 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 python-version: - - "3.11" + - "3.12" steps: diff --git a/.github/workflows/podman_secret_info.yml b/.github/workflows/podman_secret_info.yml index bb1cbb8..4e6752c 100644 --- a/.github/workflows/podman_secret_info.yml +++ b/.github/workflows/podman_secret_info.yml @@ -34,12 +34,12 @@ jobs: fail-fast: false matrix: ansible-version: - - git+https://github.com/ansible/ansible.git@stable-2.17 + - git+https://github.com/ansible/ansible.git@stable-2.18 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 python-version: - - "3.11" + - "3.12" steps: diff --git a/ci/playbooks/pre.yml b/ci/playbooks/pre.yml index 2bbabc6..7dbd0fa 100644 --- a/ci/playbooks/pre.yml +++ b/ci/playbooks/pre.yml @@ -36,10 +36,8 @@ - distro == 'CentOS7' - setup_python|default(true)|bool - - name: Upgrade pip - pip: - name: pip - extra_args: --upgrade + - name: Install Python packaging + command: pip install --upgrade setuptools packaging pip environment: PATH: /usr/local/bin:{{ ansible_env.PATH }}