diff options
| author | Zuul <zuul@review.opendev.org> | 2022-09-07 22:37:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-09-07 22:37:20 +0000 |
| commit | 2d986f8566000c53eae111fc82aebccd2c0e79b1 (patch) | |
| tree | c4705612600cdfd5cb88e9b8ed9f294fb2ebcd7d | |
| parent | 9302e576820edfadaedc04b2e4597ae2a67894a2 (diff) | |
| parent | ad03402dece90c843e16b7d24d2a90c242ff66bd (diff) | |
| download | zuul-2d986f8566000c53eae111fc82aebccd2c0e79b1.tar.gz | |
Merge "Deprecate Ansible 2, make Ansible 5 default"
| -rw-r--r-- | releasenotes/notes/deprecate-ansible-2-4c22db35d3c6c765.yaml | 5 | ||||
| -rw-r--r-- | tests/fixtures/config/ansible-versions/git/common-config/zuul.yaml | 2 | ||||
| -rw-r--r-- | tests/unit/test_web.py | 4 | ||||
| -rw-r--r-- | zuul/lib/ansible-config.conf | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/releasenotes/notes/deprecate-ansible-2-4c22db35d3c6c765.yaml b/releasenotes/notes/deprecate-ansible-2-4c22db35d3c6c765.yaml new file mode 100644 index 000000000..09a0a128c --- /dev/null +++ b/releasenotes/notes/deprecate-ansible-2-4c22db35d3c6c765.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Ansible versions 2.8 and 2.9 are now deprecated in Zuul since they + are both unmaintaned. Ansible 5 is now the default version in Zuul. diff --git a/tests/fixtures/config/ansible-versions/git/common-config/zuul.yaml b/tests/fixtures/config/ansible-versions/git/common-config/zuul.yaml index 91c8d6bca..3a34a1d86 100644 --- a/tests/fixtures/config/ansible-versions/git/common-config/zuul.yaml +++ b/tests/fixtures/config/ansible-versions/git/common-config/zuul.yaml @@ -25,7 +25,7 @@ parent: ansible-version vars: test_ansible_version_major: 2 - test_ansible_version_minor: 9 + test_ansible_version_minor: 12 # This job is used by a test case specifying a different ansible version in # zuul.conf diff --git a/tests/unit/test_web.py b/tests/unit/test_web.py index ba1931436..b15c01a69 100644 --- a/tests/unit/test_web.py +++ b/tests/unit/test_web.py @@ -1066,7 +1066,7 @@ class TestWeb(BaseTestWeb): job_params = { 'job': 'project-test1', - 'ansible_version': '2.9', + 'ansible_version': '5', 'timeout': None, 'post_timeout': None, 'items': [], @@ -1164,7 +1164,7 @@ class TestWeb(BaseTestWeb): "noop") job_params = { - 'ansible_version': '2.9', + 'ansible_version': '5', 'branch': 'master', 'extra_vars': {}, 'group_vars': {}, diff --git a/zuul/lib/ansible-config.conf b/zuul/lib/ansible-config.conf index 5bc3bd325..9fdc905b9 100644 --- a/zuul/lib/ansible-config.conf +++ b/zuul/lib/ansible-config.conf @@ -1,6 +1,6 @@ # This file describes the currently supported ansible versions [common] -default_version = 2.9 +default_version = 5 # 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 @@ -8,11 +8,13 @@ requirements = openstacksdk<0.99 openshift jmespath google-cloud-storage pywinrm # Ansible 2.8.16 breaks the k8s connection plugin # Jinja 3.1.1 is incompatible with 2.8 requirements = ansible>=2.8,<2.9,!=2.8.16 Jinja2<3.1.0 +deprecated = true [2.9] # Ansible 2.9.14 breaks the k8s connection plugin # https://github.com/ansible/ansible/issues/72171 requirements = ansible>=2.9,<2.10,!=2.9.14 +deprecated = true [5] requirements = ansible>=5.0,<6.0 |