summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-05-18 16:15:59 +0000
committerGerrit Code Review <review@openstack.org>2020-05-18 16:15:59 +0000
commit55414a5b15319b45880e8267f94d96f330aabc35 (patch)
treedb59dad208d8acdbf800950f2039f6279dfd04ac
parent4336a9db30143159c322bce91e3009236f9afbdc (diff)
parent93c19d389a1d6d407c793185a88c7053acac4c77 (diff)
downloadzuul-55414a5b15319b45880e8267f94d96f330aabc35.tar.gz
Merge "Default to Ansible 2.9"
-rw-r--r--releasenotes/notes/ansible-29-default-067e82c48805c5d5.yaml4
-rw-r--r--tests/fixtures/config/ansible-versions/git/common-config/zuul.yaml2
-rw-r--r--zuul/lib/ansible-config.conf2
3 files changed, 6 insertions, 2 deletions
diff --git a/releasenotes/notes/ansible-29-default-067e82c48805c5d5.yaml b/releasenotes/notes/ansible-29-default-067e82c48805c5d5.yaml
new file mode 100644
index 000000000..78aac682e
--- /dev/null
+++ b/releasenotes/notes/ansible-29-default-067e82c48805c5d5.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+ - |
+ Zuul now defaults to Ansible 2.9 if no version is specified.
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 a9ff58932..8e8c7f619 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: 8
+ test_ansible_version_minor: 9
# This job is used by a test case specifying a different ansible version in
# zuul.conf
diff --git a/zuul/lib/ansible-config.conf b/zuul/lib/ansible-config.conf
index e8920cb48..dae960eb6 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.8
+default_version = 2.9
requirements = ara>=0.16.5,<1.0.0 openstacksdk openshift jmespath google-cloud-storage
[2.6]