From 680b9a9309fd78be7f98ca39d831c492934a3bde Mon Sep 17 00:00:00 2001 From: Sergey <6213510+sshnaidm@users.noreply.github.com> Date: Wed, 19 Jun 2024 10:18:45 +0300 Subject: [PATCH] Upgrade Python version for latest Ansible (#786) Signed-off-by: Sagi Shnaidman --- .../collection-continuous-integration.yml | 18 ++++++++--------- .github/workflows/connections_tests.yml | 20 +++++++++++++++++-- .github/workflows/podman_container.yml | 13 ++++++++++-- .github/workflows/podman_container_exec.yml | 8 ++++---- .github/workflows/podman_container_idem.yml | 6 +++--- 5 files changed, 45 insertions(+), 20 deletions(-) diff --git a/.github/workflows/collection-continuous-integration.yml b/.github/workflows/collection-continuous-integration.yml index c6f5d65..ac12206 100644 --- a/.github/workflows/collection-continuous-integration.yml +++ b/.github/workflows/collection-continuous-integration.yml @@ -57,31 +57,31 @@ jobs: runner-os: - ubuntu-22.04 runner-python-version: - - 3.9 + - '3.10' ansible-version: - ansible<2.10 - - git+https://github.com/ansible/ansible.git@stable-2.15 + - git+https://github.com/ansible/ansible.git@stable-2.17 - git+https://github.com/ansible/ansible.git@devel python-version: - - 3.9 + - '3.10' include: - runner-os: ubuntu-22.04 - runner-python-version: '3.10' + runner-python-version: '3.11' ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: '3.10' + 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.9 + runner-python-version: '3.10' ansible-version: git+https://github.com/ansible/ansible.git@devel - python-version: 3.9 + python-version: '3.10' - runner-os: ubuntu-22.04 - runner-python-version: 3.9 + runner-python-version: '3.10' ansible-version: ansible<2.10 - python-version: 3.9 + 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 fc4b002..56fe187 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.15 + - git+https://github.com/ansible/ansible.git@stable-2.17 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 @@ -90,6 +90,14 @@ jobs: #- 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" + exclude: + - os: ubuntu-22.04 + ansible-version: git+https://github.com/ansible/ansible.git@devel + python-version: "3.10" steps: @@ -167,7 +175,7 @@ jobs: matrix: ansible-version: - ansible<2.10 - - git+https://github.com/ansible/ansible.git@stable-2.15 + - git+https://github.com/ansible/ansible.git@stable-2.17 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 @@ -180,6 +188,14 @@ jobs: #- 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" + exclude: + - os: ubuntu-22.04 + ansible-version: git+https://github.com/ansible/ansible.git@devel + python-version: "3.10" steps: diff --git a/.github/workflows/podman_container.yml b/.github/workflows/podman_container.yml index d9cd33e..e71ac1c 100644 --- a/.github/workflows/podman_container.yml +++ b/.github/workflows/podman_container.yml @@ -43,7 +43,7 @@ jobs: matrix: ansible-version: - ansible<2.10 - - git+https://github.com/ansible/ansible.git@stable-2.15 + - git+https://github.com/ansible/ansible.git@stable-2.17 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 @@ -53,9 +53,18 @@ jobs: - unstable include: - os: ubuntu-22.04 - ansible-version: git+https://github.com/ansible/ansible.git@stable-2.15 + ansible-version: git+https://github.com/ansible/ansible.git@stable-2.17 python-version: "3.10" podman-version: stable + - os: ubuntu-22.04 + ansible-version: git+https://github.com/ansible/ansible.git@devel + python-version: "3.11" + podman-version: unstable + exclude: + - os: ubuntu-22.04 + ansible-version: git+https://github.com/ansible/ansible.git@devel + python-version: "3.10" + podman-version: unstable steps: diff --git a/.github/workflows/podman_container_exec.yml b/.github/workflows/podman_container_exec.yml index a8d5605..f81f22b 100644 --- a/.github/workflows/podman_container_exec.yml +++ b/.github/workflows/podman_container_exec.yml @@ -34,13 +34,13 @@ jobs: fail-fast: false matrix: ansible-version: - - ansible<2.10 - # - git+https://github.com/ansible/ansible.git@stable-2.11 + # - ansible<2.10 + - git+https://github.com/ansible/ansible.git@stable-2.17 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 python-version: - - "3.10" + - "3.11" steps: @@ -96,4 +96,4 @@ jobs: -e ansible_connection=local \ -e setup_python=false TEST2RUN=podman_container_exec ./ci/run_containers_tests.sh - shell: bash \ No newline at end of file + shell: bash diff --git a/.github/workflows/podman_container_idem.yml b/.github/workflows/podman_container_idem.yml index a6db742..6b360d6 100644 --- a/.github/workflows/podman_container_idem.yml +++ b/.github/workflows/podman_container_idem.yml @@ -38,13 +38,13 @@ jobs: fail-fast: false matrix: ansible-version: - - ansible<2.10 - # - git+https://github.com/ansible/ansible.git@stable-2.11 + # - ansible<2.10 + - git+https://github.com/ansible/ansible.git@stable-2.17 - git+https://github.com/ansible/ansible.git@devel os: - ubuntu-22.04 python-version: - - "3.10" + - "3.11" steps: