From 5c2ec08cf2eb7e44b3cdc9e793a8c0386740c650 Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman Date: Wed, 22 May 2024 15:35:17 -0300 Subject: [PATCH] upstream CI: bump vm and ansible versions As ansible-core 2.17 was released and it does not support Python 2 or Python 3.6, this patch adds tests for both latest ansible-core and ansible-core 2.16, and it also bumps the different versions of ansible-core to use 2.14, 2.15 and 2.16 for the pipelines. Also, the Ubuntu VM image version is updated to 22.04. --- tests/azure/azure-pipelines.yml | 27 ++++++++---- tests/azure/build-containers.yml | 2 +- tests/azure/nightly.yml | 74 ++++++++++++++++---------------- tests/azure/pr-pipeline.yml | 14 +++--- 4 files changed, 64 insertions(+), 53 deletions(-) diff --git a/tests/azure/azure-pipelines.yml b/tests/azure/azure-pipelines.yml index ab28bb110..fce7c82f6 100644 --- a/tests/azure/azure-pipelines.yml +++ b/tests/azure/azure-pipelines.yml @@ -3,7 +3,7 @@ trigger: - master pool: - vmImage: 'ubuntu-20.04' + vmImage: 'ubuntu-22.04' stages: @@ -31,25 +31,36 @@ stages: # Fedora -- stage: Fedora_Latest +- stage: Fedora_Ansible_2_16 dependsOn: [] jobs: - template: templates/group_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: fedora-latest - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core >=2.16,<2.17" # Galaxy on Fedora -- stage: Galaxy_Fedora_Latest +- stage: Galaxy_Fedora_Ansible_Latest dependsOn: [] jobs: - template: templates/galaxy_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: fedora-latest - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core" + +# Galaxy on Fedora + +- stage: Galaxy_Fedora_Ansible_2_16 + dependsOn: [] + jobs: + - template: templates/galaxy_tests.yml + parameters: + build_number: $(Build.BuildNumber) + scenario: fedora-latest + ansible_version: "-core >=2.16,<2.17" # CentOS 9 Stream @@ -60,7 +71,7 @@ stages: parameters: build_number: $(Build.BuildNumber) scenario: c9s - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core >=2.16,<2.17" # CentOS 8 Stream @@ -71,7 +82,7 @@ stages: parameters: build_number: $(Build.BuildNumber) scenario: c8s - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core >=2.16,<2.17" # CentOS 7 @@ -82,4 +93,4 @@ stages: parameters: build_number: $(Build.BuildNumber) scenario: centos-7 - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core >=2.16,<2.17" diff --git a/tests/azure/build-containers.yml b/tests/azure/build-containers.yml index 0423dfd9c..a75319a4e 100644 --- a/tests/azure/build-containers.yml +++ b/tests/azure/build-containers.yml @@ -11,7 +11,7 @@ schedules: trigger: none pool: - vmImage: 'ubuntu-20.04' + vmImage: 'ubuntu-22.04' stages: diff --git a/tests/azure/nightly.yml b/tests/azure/nightly.yml index 89914f8e4..213e83101 100644 --- a/tests/azure/nightly.yml +++ b/tests/azure/nightly.yml @@ -10,38 +10,38 @@ schedules: trigger: none pool: - vmImage: 'ubuntu-20.04' + vmImage: 'ubuntu-22.04' stages: # Fedora -- stage: FedoraLatest_Ansible_Core_2_13 +- stage: FedoraLatest_Ansible_Core_2_14 dependsOn: [] jobs: - template: templates/group_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: fedora-latest - ansible_version: "-core >=2.13,<2.14" + ansible_version: "-core >=2.14,<2.15" -- stage: FedoraLatest_Ansible_Core_2_14 +- stage: FedoraLatest_Ansible_Core_2_15 dependsOn: [] jobs: - template: templates/group_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: fedora-latest - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core >=2.15,<2.16" -- stage: FedoraLatest_Ansible_Core_2_15 +- stage: FedoraLatest_Ansible_Core_2_16 dependsOn: [] jobs: - template: templates/group_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: fedora-latest - ansible_version: "-core >=2.15,<2.16" + ansible_version: "-core >=2.16,<2.17" - stage: FedoraLatest_Ansible_latest dependsOn: [] @@ -54,32 +54,32 @@ stages: # Galaxy on Fedora -- stage: Galaxy_FedoraLatest_Ansible_Core_2_13 +- stage: Galaxy_FedoraLatest_Ansible_Core_2_14 dependsOn: [] jobs: - template: templates/galaxy_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: fedora-latest - ansible_version: "-core >=2.13,<2.14" + ansible_version: "-core >=2.14,<2.15" -- stage: Galaxy_FedoraLatest_Ansible_Core_2_14 +- stage: Galaxy_FedoraLatest_Ansible_Core_2_15 dependsOn: [] jobs: - template: templates/galaxy_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: fedora-latest - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core >=2.15,<2.16" -- stage: Galaxy_FedoraLatest_Ansible_Core_2_15 +- stage: Galaxy_FedoraLatest_Ansible_Core_2_16 dependsOn: [] jobs: - template: templates/galaxy_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: fedora-latest - ansible_version: "-core >=2.15,<2.16" + ansible_version: "-core >=2.16,<2.17" - stage: Galaxy_FedoraLatest_Ansible_latest dependsOn: [] @@ -92,32 +92,32 @@ stages: # Fedora Rawhide -- stage: FedoraRawhide_Ansible_Core_2_13 +- stage: FedoraRawhide_Ansible_Core_2_14 dependsOn: [] jobs: - template: templates/group_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: fedora-rawhide - ansible_version: "-core >=2.13,<2.14" + ansible_version: "-core >=2.14,<2.15" -- stage: FedoraRawhide_Ansible_Core_2_14 +- stage: FedoraRawhide_Ansible_Core_2_15 dependsOn: [] jobs: - template: templates/group_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: fedora-rawhide - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core >=2.15,<2.16" -- stage: FedoraRawhide_Ansible_Core_2_15 +- stage: FedoraRawhide_Ansible_Core_2_16 dependsOn: [] jobs: - template: templates/group_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: fedora-rawhide - ansible_version: "-core >=2.15,<2.16" + ansible_version: "-core >=2.16,<2.17" - stage: FedoraRawhide_Ansible_latest dependsOn: [] @@ -130,32 +130,32 @@ stages: # CentoOS 9 Stream -- stage: c9s_Ansible_Core_2_13 +- stage: c9s_Ansible_Core_2_14 dependsOn: [] jobs: - template: templates/group_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: c9s - ansible_version: "-core >=2.13,<2.14" + ansible_version: "-core >=2.14,<2.15" -- stage: c9s_Ansible_Core_2_14 +- stage: c9s_Ansible_Core_2_15 dependsOn: [] jobs: - template: templates/group_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: c9s - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core >=2.15,<2.16" -- stage: c9s_Ansible_Core_2_15 +- stage: c9s_Ansible_Core_2_16 dependsOn: [] jobs: - template: templates/group_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: c9s - ansible_version: "-core >=2.15,<2.16" + ansible_version: "-core >=2.16,<2.17" - stage: c9s_Ansible_latest dependsOn: [] @@ -168,32 +168,32 @@ stages: # CentOS 8 Stream -- stage: c8s_Ansible_Core_2_13 +- stage: c8s_Ansible_Core_2_14 dependsOn: [] jobs: - template: templates/group_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: c8s - ansible_version: "-core >=2.13,<2.14" + ansible_version: "-core >=2.14,<2.15" -- stage: c8s_Ansible_Core_2_14 +- stage: c8s_Ansible_Core_2_15 dependsOn: [] jobs: - template: templates/group_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: c8s - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core >=2.15,<2.16" -- stage: c8s_Ansible_Core_2_15 +- stage: c8s_Ansible_Core_2_16 dependsOn: [] jobs: - template: templates/group_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: c8s - ansible_version: "-core >=2.15,<2.16" + ansible_version: "-core >=2.16,<2.17" - stage: c8s_Ansible_latest dependsOn: [] @@ -206,32 +206,32 @@ stages: # CentOS 7 -- stage: CentOS7_Ansible_Core_2_13 +- stage: CentOS7_Ansible_Core_2_14 dependsOn: [] jobs: - template: templates/group_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: centos-7 - ansible_version: "-core >=2.13,<2.14" + ansible_version: "-core >=2.14,<2.15" -- stage: CentOS7_Ansible_Core_2_14 +- stage: CentOS7_Ansible_Core_2_15 dependsOn: [] jobs: - template: templates/group_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: centos-7 - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core >=2.15,<2.16" -- stage: CentOS7_Ansible_Core_2_15 +- stage: CentOS7_Ansible_Core_2_16 dependsOn: [] jobs: - template: templates/group_tests.yml parameters: build_number: $(Build.BuildNumber) scenario: centos-7 - ansible_version: "-core >=2.15,<2.16" + ansible_version: "-core >=2.16,<2.17" - stage: CentOS7_Ansible_latest dependsOn: [] diff --git a/tests/azure/pr-pipeline.yml b/tests/azure/pr-pipeline.yml index 2345347db..597e4c5a0 100644 --- a/tests/azure/pr-pipeline.yml +++ b/tests/azure/pr-pipeline.yml @@ -3,7 +3,7 @@ trigger: - master pool: - vmImage: 'ubuntu-20.04' + vmImage: 'ubuntu-22.04' stages: @@ -16,7 +16,7 @@ stages: parameters: build_number: $(Build.BuildNumber) scenario: fedora-latest - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core >=2.15,<2.16" # Galaxy on Fedora @@ -27,7 +27,7 @@ stages: parameters: build_number: $(Build.BuildNumber) scenario: fedora-latest - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core >=2.16,<2.17" # CentOS 9 Stream @@ -38,7 +38,7 @@ stages: parameters: build_number: $(Build.BuildNumber) scenario: c9s - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core >=2.16,<2.17" # CentOS 8 Stream @@ -49,7 +49,7 @@ stages: parameters: build_number: $(Build.BuildNumber) scenario: c8s - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core >=2.16,<2.17" # CentOS 7 @@ -60,7 +60,7 @@ stages: parameters: build_number: $(Build.BuildNumber) scenario: centos-7 - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core >=2.16,<2.17" # Rawhide @@ -71,4 +71,4 @@ stages: parameters: build_number: $(Build.BuildNumber) scenario: fedora-rawhide - ansible_version: "-core >=2.14,<2.15" + ansible_version: "-core >=2.16,<2.17"