From 0f530df092f93744c93cd976aa1d85aec998091e Mon Sep 17 00:00:00 2001
From: Rafael Guterres Jeffman <rjeffman@redhat.com>
Date: Sat, 26 Oct 2024 12:20:22 -0300
Subject: [PATCH] upstream CI: Update Ansible version
ansible-core versions 2.15 and 2.16 and used for all pipelines, but
version 2.17 is not used for CentOS 8 Stream, as platform python on
this version is 3.6 which is not supported in this ansible-core version.
---
infra/azure/azure-pipelines.yml | 10 +--
infra/azure/nightly.yml | 126 ++++++--------------------------
2 files changed, 27 insertions(+), 109 deletions(-)
diff --git a/infra/azure/azure-pipelines.yml b/infra/azure/azure-pipelines.yml
index 2043940..7456b62 100644
--- a/infra/azure/azure-pipelines.yml
+++ b/infra/azure/azure-pipelines.yml
@@ -28,7 +28,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
distro: fedora-latest
- ansible_version: "-core <2.14"
+ ansible_version: "-core <2.16"
skip_git_test: true
# Fedora
@@ -40,8 +40,8 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
distro: fedora-latest
- ansible_version: "-core >=2.14,<2.15"
skip_git_test: true
+ ansible_version: "-core >=2.16,<2.17"
# Galaxy on Fedora
@@ -52,7 +52,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
distro: fedora-latest
- ansible_version: "-core >=2.14,<2.15"
+ ansible_version: "-core >=2.16,<2.17"
skip_git_test: true
test_galaxy: true
@@ -65,7 +65,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
distro: c9s
- ansible_version: "-core >=2.14,<2.15"
+ ansible_version: "-core >=2.16,<2.17"
skip_git_test: true
# CentOS 8 Stream
@@ -77,5 +77,5 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
distro: c8s
- ansible_version: "-core >=2.14,<2.15"
+ ansible_version: "-core <2.17"
skip_git_test: true
diff --git a/infra/azure/nightly.yml b/infra/azure/nightly.yml
index cbbc988..671571a 100644
--- a/infra/azure/nightly.yml
+++ b/infra/azure/nightly.yml
@@ -16,27 +16,7 @@ stages:
# Fedora
-- stage: FedoraLatest_Ansible_Core_2_13
- dependsOn: []
- jobs:
- - template: templates/group_tests.yml
- parameters:
- build_number: $(Build.BuildNumber)
- distro: fedora-latest
- ansible_version: "-core >=2.13,<2.14"
- skip_git_test: false
-
-- stage: FedoraLatest_Ansible_Core_2_14
- dependsOn: []
- jobs:
- - template: templates/group_tests.yml
- parameters:
- build_number: $(Build.BuildNumber)
- distro: fedora-latest
- ansible_version: "-core >=2.14,<2.15"
- skip_git_test: false
-
-- stage: FedoraLatest_Ansible_Core_2_15
+- stage: fedora_latest_Ansible_Core_2_15
dependsOn: []
jobs:
- template: templates/group_tests.yml
@@ -46,7 +26,7 @@ stages:
ansible_version: "-core >=2.15,<2.16"
skip_git_test: true
-- stage: FedoraLatest_Ansible_latest
+- stage: fedora_latest_Ansible_Core_2_16
dependsOn: []
jobs:
- template: templates/group_tests.yml
@@ -56,105 +36,43 @@ stages:
ansible_version: ""
skip_git_test: true
-# Galaxy on Fedora
-
-- stage: Galaxy_FedoraLatest_Ansible_Core_2_13
+- stage: fedora_latest_Ansible_Core_2_17
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
distro: fedora-latest
- ansible_version: "-core >=2.13,<2.14"
- skip_git_test: false
- test_galaxy: true
+ ansible_version: "-core >=2.17"
+ skip_git_test: true
-- stage: Galaxy_FedoraLatest_Ansible_Core_2_14
- dependsOn: []
- jobs:
- - template: templates/group_tests.yml
- parameters:
- build_number: $(Build.BuildNumber)
- distro: fedora-latest
- ansible_version: "-core >=2.14,<2.15"
- skip_git_test: false
- test_galaxy: true
+# Galaxy on Fedora
-- stage: Galaxy_FedoraLatest_Ansible_Core_2_15
+- stage: Galaxy_fedora_latest_Ansible_Core_2_17
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
distro: fedora-latest
- ansible_version: "-core >=2.15,<2.16"
+ ansible_version: "-core >=2.17,<2.18"
skip_git_test: true
test_galaxy: true
# Fedora Rawhide
-- stage: FedoraRawhide_Ansible_Core_2_13
+- stage: fedora_rawhide_Ansible_Core_2_17
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
distro: fedora-rawhide
- ansible_version: "-core >=2.13,<2.14"
- skip_git_test: false
-
-- stage: FedoraRawhide_Ansible_Core_2_14
- dependsOn: []
- jobs:
- - template: templates/group_tests.yml
- parameters:
- build_number: $(Build.BuildNumber)
- distro: fedora-rawhide
- ansible_version: "-core >=2.14,<2.15"
- skip_git_test: false
-
-- stage: FedoraRawhide_Ansible_Core_2_15
- dependsOn: []
- jobs:
- - template: templates/group_tests.yml
- parameters:
- build_number: $(Build.BuildNumber)
- distro: fedora-rawhide
- ansible_version: "-core >=2.15,<2.16"
- skip_git_test: true
-
-- stage: FedoraRawhide_Ansible_latest
- dependsOn: []
- jobs:
- - template: templates/group_tests.yml
- parameters:
- build_number: $(Build.BuildNumber)
- distro: fedora-rawhide
- ansible_version: ""
+ ansible_version: "-core >=2.17,<2.18"
skip_git_test: true
# CentoOS 9 Stream
-- stage: c9s_Ansible_Core_2_13
- dependsOn: []
- jobs:
- - template: templates/group_tests.yml
- parameters:
- build_number: $(Build.BuildNumber)
- distro: c9s
- ansible_version: "-core >=2.13,<2.14"
- skip_git_test: false
-
-- stage: c9s_Ansible_Core_2_14
- dependsOn: []
- jobs:
- - template: templates/group_tests.yml
- parameters:
- build_number: $(Build.BuildNumber)
- distro: c9s
- ansible_version: "-core >=2.14,<2.15"
- skip_git_test: false
-
- stage: c9s_Ansible_Core_2_15
dependsOn: []
jobs:
@@ -165,44 +83,44 @@ stages:
ansible_version: "-core >=2.15,<2.16"
skip_git_test: true
-- stage: c9s_Ansible_latest
+- stage: c9s_Ansible_Core_2_16
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
distro: c9s
- ansible_version: ""
+ ansible_version: "-core >=2.16,<2.17"
skip_git_test: true
-# CentOS 8 Stream
-
-- stage: c8s_Ansible_Core_2_13
+- stage: c9s_Ansible_Core_2_17
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
- distro: c8s
- ansible_version: "-core >=2.13,<2.14"
+ distro: c9s
+ ansible_version: "-core >=2.17,<2.18"
skip_git_test: true
-- stage: c8s_Ansible_Core_2_14
+# CentOS 8 Stream only works up to ansible-core 2.16.z
+
+- stage: c8s_Ansible_Core_2_15
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
distro: c8s
- ansible_version: "-core >=2.14,<2.15"
- skip_git_test: false
+ ansible_version: "-core >=2.15,<2.16"
+ skip_git_test: true
-- stage: c8s_Ansible_Core_2_15
+- stage: c8s_Ansible_Core_2_16
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
distro: c8s
- ansible_version: "-core >=2.15,<2.16"
+ ansible_version: "-core >=2.16,<2.17"
skip_git_test: true
--
GitLab