From 51f64e43939f0259ab4f991837420fb7bce238fa Mon Sep 17 00:00:00 2001
From: Rafael Guterres Jeffman <rjeffman@redhat.com>
Date: Mon, 5 Jun 2023 14:43:23 -0300
Subject: [PATCH] upstream CI: Update ansible-core version
ansible-core 2.15 has been released on May 15th, 2023, and version 2.12
has reached EOL on May 22nd, 2023.
This patch updates the ansible-core versions used on upstream CI tests
to reflect Ansible's new releases.
---
.github/workflows/docs.yml | 18 ++++-----
.github/workflows/lint.yml | 2 +-
tests/azure/azure-pipelines.yml | 10 ++---
tests/azure/nightly.yml | 72 ++++++++++++++++-----------------
tests/azure/pr-pipeline.yml | 12 +++---
utils/run-tests.sh | 2 +-
6 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index e0e8d662..c5f1719b 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -5,7 +5,7 @@ on:
- pull_request
jobs:
check_docs_oldest_supported:
- name: Check Ansible Documentation with ansible-core 2.12.
+ name: Check Ansible Documentation with ansible-core 2.13.
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.1.0
@@ -14,15 +14,15 @@ jobs:
- uses: actions/setup-python@v4.3.0
with:
python-version: '3.x'
- - name: Install Ansible 2.12
+ - name: Install Ansible 2.13
run: |
- python -m pip install "ansible-core >=2.12,<2.13"
+ python -m pip install "ansible-core >=2.13,<2.14"
- name: Run ansible-doc-test
run: |
ANSIBLE_LIBRARY="." ANSIBLE_DOC_FRAGMENT_PLUGINS="." python utils/ansible-doc-test -v roles plugins
check_docs_previous:
- name: Check Ansible Documentation with ansible-core 2.13.
+ name: Check Ansible Documentation with ansible-core 2.14.
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.1.0
@@ -31,15 +31,15 @@ jobs:
- uses: actions/setup-python@v4.3.0
with:
python-version: '3.x'
- - name: Install Ansible 2.13
+ - name: Install Ansible 2.14
run: |
- python -m pip install "ansible-core >=2.13,<2.14"
+ python -m pip install "ansible-core >=2.14,<2.15"
- name: Run ansible-doc-test
run: |
ANSIBLE_LIBRARY="." ANSIBLE_DOC_FRAGMENT_PLUGINS="." python utils/ansible-doc-test -v roles plugins
check_docs_current:
- name: Check Ansible Documentation with ansible-core 2.14.
+ name: Check Ansible Documentation with ansible-core 2.15.
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.1.0
@@ -48,9 +48,9 @@ jobs:
- uses: actions/setup-python@v4.3.0
with:
python-version: '3.x'
- - name: Install Ansible 2.14
+ - name: Install Ansible 2.15
run: |
- python -m pip install "ansible-core >=2.14,<2.15"
+ python -m pip install "ansible-core >=2.15,<2.16"
- name: Run ansible-doc-test
run: |
ANSIBLE_LIBRARY="." ANSIBLE_DOC_FRAGMENT_PLUGINS="." python utils/ansible-doc-test -v roles plugins
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b4d64066..d5f2261a 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
python-version: "3.x"
- name: Run ansible-lint
run: |
- pip install "ansible-core >=2.14,<2.15" ansible-lint
+ pip install "ansible-core >=2.15,<2.16" ansible-lint
utils/build-galaxy-release.sh -ki
cd .galaxy-build
ansible-lint
diff --git a/tests/azure/azure-pipelines.yml b/tests/azure/azure-pipelines.yml
index 2dfc2534..dab6977f 100644
--- a/tests/azure/azure-pipelines.yml
+++ b/tests/azure/azure-pipelines.yml
@@ -27,7 +27,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
- ansible_version: "-core >=2.13,<2.14"
+ ansible_version: "-core >=2.14,<2.15"
# Galaxy on Fedora
@@ -38,7 +38,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
- ansible_version: "-core >=2.13,<2.14"
+ ansible_version: "-core >=2.14,<2.15"
# CentOS 9 Stream
@@ -49,7 +49,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: c9s
- ansible_version: "-core >=2.13,<2.14"
+ ansible_version: "-core >=2.14,<2.15"
# CentOS 8 Stream
@@ -60,7 +60,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: c8s
- ansible_version: "-core >=2.13,<2.14"
+ ansible_version: "-core >=2.14,<2.15"
# CentOS 7
@@ -71,4 +71,4 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: centos-7
- ansible_version: "-core >=2.13,<2.14"
+ ansible_version: "-core >=2.14,<2.15"
diff --git a/tests/azure/nightly.yml b/tests/azure/nightly.yml
index e60839ce..89914f8e 100644
--- a/tests/azure/nightly.yml
+++ b/tests/azure/nightly.yml
@@ -16,32 +16,32 @@ stages:
# Fedora
-- stage: FedoraLatest_Ansible_Core_2_12
+- stage: FedoraLatest_Ansible_Core_2_13
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
- ansible_version: "-core >=2.12,<2.13"
+ ansible_version: "-core >=2.13,<2.14"
-- 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_latest
dependsOn: []
@@ -54,32 +54,32 @@ stages:
# Galaxy on Fedora
-- stage: Galaxy_FedoraLatest_Ansible_Core_2_12
+- stage: Galaxy_FedoraLatest_Ansible_Core_2_13
dependsOn: []
jobs:
- template: templates/galaxy_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
- ansible_version: "-core >=2.12,<2.13"
+ ansible_version: "-core >=2.13,<2.14"
-- 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_latest
dependsOn: []
@@ -92,32 +92,32 @@ stages:
# Fedora Rawhide
-- stage: FedoraRawhide_Ansible_Core_2_12
+- stage: FedoraRawhide_Ansible_Core_2_13
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-rawhide
- ansible_version: "-core >=2.12,<2.13"
+ ansible_version: "-core >=2.13,<2.14"
-- 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_latest
dependsOn: []
@@ -130,32 +130,32 @@ stages:
# CentoOS 9 Stream
-- stage: c9s_Ansible_Core_2_12
+- stage: c9s_Ansible_Core_2_13
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: c9s
- ansible_version: "-core >=2.12,<2.13"
+ ansible_version: "-core >=2.13,<2.14"
-- 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_latest
dependsOn: []
@@ -168,32 +168,32 @@ stages:
# CentOS 8 Stream
-- stage: c8s_Ansible_Core_2_12
+- stage: c8s_Ansible_Core_2_13
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: c8s
- ansible_version: "-core >=2.12,<2.13"
+ ansible_version: "-core >=2.13,<2.14"
-- 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_latest
dependsOn: []
@@ -206,32 +206,32 @@ stages:
# CentOS 7
-- stage: CentOS7_Ansible_Core_2_12
+- stage: CentOS7_Ansible_Core_2_13
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: centos-7
- ansible_version: "-core >=2.12,<2.13"
+ ansible_version: "-core >=2.13,<2.14"
-- 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_latest
dependsOn: []
diff --git a/tests/azure/pr-pipeline.yml b/tests/azure/pr-pipeline.yml
index 50692ab7..2345347d 100644
--- a/tests/azure/pr-pipeline.yml
+++ b/tests/azure/pr-pipeline.yml
@@ -16,7 +16,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
- ansible_version: "-core >=2.12,<2.13"
+ ansible_version: "-core >=2.14,<2.15"
# Galaxy on Fedora
@@ -27,7 +27,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
- ansible_version: "-core >=2.12,<2.13"
+ ansible_version: "-core >=2.14,<2.15"
# CentOS 9 Stream
@@ -38,7 +38,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: c9s
- ansible_version: "-core >=2.13,<2.14"
+ ansible_version: "-core >=2.14,<2.15"
# CentOS 8 Stream
@@ -49,7 +49,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: c8s
- ansible_version: "-core >=2.13,<2.14"
+ ansible_version: "-core >=2.14,<2.15"
# CentOS 7
@@ -60,7 +60,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: centos-7
- ansible_version: "-core >=2.13,<2.14"
+ ansible_version: "-core >=2.14,<2.15"
# Rawhide
@@ -71,4 +71,4 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-rawhide
- ansible_version: "-core >=2.13,<2.14"
+ ansible_version: "-core >=2.14,<2.15"
diff --git a/utils/run-tests.sh b/utils/run-tests.sh
index d227b3bb..5852780f 100755
--- a/utils/run-tests.sh
+++ b/utils/run-tests.sh
@@ -162,7 +162,7 @@ list_images() {
# Defaults
-ANSIBLE_VERSION=${ANSIBLE_VERSION:-'ansible-core>=2.12,<2.13'}
+ANSIBLE_VERSION=${ANSIBLE_VERSION:-'ansible-core'}
verbose=""
FORCE_ENV="N"
CONTINUE_ON_ERROR=""
--
GitLab