diff options
| author | Zane Bitter <zbitter@redhat.com> | 2019-10-29 15:48:28 -0400 |
|---|---|---|
| committer | Zane Bitter <zbitter@redhat.com> | 2019-11-06 16:55:41 +0800 |
| commit | e0dbb3f7fa7450ae577f707c8942f452171551b6 (patch) | |
| tree | 9b1b59ee7c4746fc09e1b9ef24b239abad76c3a9 /.zuul.yaml | |
| parent | 9f3ea0a63e6b0702dd88bc230af9ddf13621e017 (diff) | |
| download | heat-e0dbb3f7fa7450ae577f707c8942f452171551b6.tar.gz | |
Drop Python2 support
Change-Id: I6f248dfd82502ef225ba755246c2de385d30f4b2
Diffstat (limited to '.zuul.yaml')
| -rw-r--r-- | .zuul.yaml | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index 200746ccf..367ed273a 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -33,21 +33,21 @@ sql: mysql use_amqp1: 0 use_apache: 1 - use_python3: 0 + use_python3: 1 branch_override: default - job: - name: heat-functional-orig-mysql-lbaasv2 + name: heat-functional-legacy parent: heat-functional-devstack-base vars: disable_convergence: 'true' - job: - name: heat-functional-convg-mysql-lbaasv2 + name: heat-functional parent: heat-functional-devstack-base - job: - name: heat-functional-convg-mysql-lbaasv2-amqp1 + name: heat-functional-amqp1 parent: heat-functional-devstack-base voting: false branches: master @@ -55,19 +55,13 @@ use_amqp1: 1 - job: - name: heat-functional-convg-mysql-lbaasv2-non-apache + name: heat-functional-non-apache parent: heat-functional-devstack-base voting: false vars: use_apache: 0 - job: - name: heat-functional-convg-mysql-lbaasv2-py3 - parent: heat-functional-devstack-base - vars: - use_python3: 1 - -- job: name: grenade-heat parent: legacy-dsvm-base run: playbooks/devstack/grenade/run.yaml @@ -105,8 +99,7 @@ templates: - openstack-cover-jobs - openstack-lower-constraints-jobs - - openstack-python-jobs - - openstack-python3-train-jobs + - openstack-python3-ussuri-jobs - periodic-stable-jobs - publish-openstack-docs-pti - check-requirements @@ -115,19 +108,17 @@ jobs: - grenade-heat - grenade-heat-multinode - - heat-functional-orig-mysql-lbaasv2 - - heat-functional-convg-mysql-lbaasv2 - - heat-functional-convg-mysql-lbaasv2-amqp1 - - heat-functional-convg-mysql-lbaasv2-non-apache - - heat-functional-convg-mysql-lbaasv2-py3 + - heat-functional + - heat-functional-legacy + - heat-functional-amqp1 + - heat-functional-non-apache gate: queue: heat jobs: - grenade-heat - grenade-heat-multinode - - heat-functional-orig-mysql-lbaasv2 - - heat-functional-convg-mysql-lbaasv2 - - heat-functional-convg-mysql-lbaasv2-py3 + - heat-functional + - heat-functional-legacy experimental: jobs: - tripleo-ci-centos-7-scenario002-standalone |