zuul
/
zuul
Code Issues Proposed changes

Deprecate Ansible 5, make Ansible 6 the default 

Ansible 5 is no longer supported and 6 is available and working.
Deprecate Ansible 5.

Change-Id: I8c152f7c0818bccd07f50e85bef9a82ddb863a68
This commit is contained in:
James E. Blair 2022-10-11 16:48:10 -07:00
parent 4bda3e1969
commit 81e9a51185
6 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
releasenotes/notes/deprecate-ansible-5-eed0feccaabbb61f.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Ansible versions 5 is now deprecated in Zuul since it is
unmaintaned, and it will be removed from a future version of Zuul.
Ansible 6 is now the default version in Zuul.

6
tests/fixtures/config/ansible-versions/git/common-config/zuul.yaml vendored
View File

@ -25,16 +25,16 @@
parent: ansible-version parent: ansible-version
vars: vars:
test_ansible_version_major: 2 test_ansible_version_major: 2
test_ansible_version_minor: 12 test_ansible_version_minor: 13
# This job is used by a test case specifying a different ansible version in # This job is used by a test case specifying a different ansible version in
# zuul.conf # fixtures/zuul-default-ansible-version.conf
- job: - job:
name: ansible-default-zuul-conf name: ansible-default-zuul-conf
parent: ansible-version parent: ansible-version
vars: vars:
test_ansible_version_major: 2 test_ansible_version_major: 2
test_ansible_version_minor: 13 test_ansible_version_minor: 12
- job: - job:
name: ansible-5 name: ansible-5

2
tests/fixtures/zuul-default-ansible-version.conf vendored
View File

@ -7,7 +7,7 @@ server=127.0.0.1
tenant_config=main.yaml tenant_config=main.yaml
relative_priority=true relative_priority=true
# Used by ansible-default-zuul-conf job # Used by ansible-default-zuul-conf job
default_ansible_version=6 default_ansible_version=5
[merger] [merger]
git_dir=/tmp/zuul-test/merger-git git_dir=/tmp/zuul-test/merger-git

4
tests/unit/test_web.py
View File

@ -1141,7 +1141,7 @@ class TestWeb(BaseTestWeb):
job_params = { job_params = {
'job': 'project-test1', 'job': 'project-test1',
'ansible_version': '5', 'ansible_version': '6',
'timeout': None, 'timeout': None,
'post_timeout': None, 'post_timeout': None,
'items': [], 'items': [],
@ -1240,7 +1240,7 @@ class TestWeb(BaseTestWeb):
"noop") "noop")
job_params = { job_params = {
'ansible_version': '5', 'ansible_version': '6',
'branch': 'master', 'branch': 'master',
'extra_vars': {}, 'extra_vars': {},
'group_vars': {}, 'group_vars': {},

2
tests/unit/test_zk.py
View File

@ -1352,7 +1352,7 @@ class TestSystemConfigCache(ZooKeeperBaseTestCase):
"use_relative_priority": True, "use_relative_priority": True,
"max_hold_expiration": 7200, "max_hold_expiration": 7200,
"default_hold_expiration": 3600, "default_hold_expiration": 3600,
"default_ansible_version": "5", "default_ansible_version": "6",
"web_root": "/web/root", "web_root": "/web/root",
"web_status_url": "/web/status", "web_status_url": "/web/status",
"websocket_url": "/web/socket", "websocket_url": "/web/socket",

3
zuul/lib/ansible-config.conf
View File

@ -1,11 +1,12 @@
# This file describes the currently supported ansible versions # This file describes the currently supported ansible versions
[common] [common]
default_version = 5 default_version = 6
# OpenStackSDK 0.99.0 coincides with CORS header problems in some providers # OpenStackSDK 0.99.0 coincides with CORS header problems in some providers
requirements = openstacksdk<0.99 openshift jmespath google-cloud-storage pywinrm boto3 azure-storage-blob ibm-cos-sdk netaddr passlib requirements = openstacksdk<0.99 openshift jmespath google-cloud-storage pywinrm boto3 azure-storage-blob ibm-cos-sdk netaddr passlib
[5] [5]
requirements = ansible>=5.0,<6.0 requirements = ansible>=5.0,<6.0
deprecated = true
[6] [6]
requirements = ansible>=6.0,<7.0 requirements = ansible>=6.0,<7.0