From 0dae66c1b4c87f054a183a4284f656113d0bed86 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Mon, 4 May 2020 10:24:29 -0700 Subject: [PATCH] Pin stable/queens tempest tests to 0.7.0 tag Master of designate-tempest-plugin has removed support for python 2.7, but the stable/queens designate runs on python2.7. This patch will pin the tempest jobs to use the 0.7.0 tag for designate-tempest-plugin as it was the last tag that supports python2.7. This patch also forces the grenade job to use python2. Change-Id: I87d2a9de9178b0c8b41d4ac4c8b674b7900b3546 --- .zuul.yaml | 6 ++++-- devstack/upgrade/settings | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 1c3bef2aa..9e424bec3 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -11,7 +11,8 @@ - openstack/devstack-gate - openstack/designate - openstack/designate-dashboard - - openstack/designate-tempest-plugin + - name: openstack/designate-tempest-plugin + override-checkout: 0.7.0 - openstack/python-designateclient - openstack/tempest run: playbooks/legacy/designate-devstack-base/run.yaml @@ -50,7 +51,8 @@ - openstack/devstack-gate - openstack/designate - openstack/designate-dashboard - - openstack/designate-tempest-plugin + - name: openstack/designate-tempest-plugin + override-checkout: 0.7.0 - openstack/python-designateclient run: playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml post-run: playbooks/legacy/grenade-devstack-designate-pdns4/post.yaml diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index af6949f28..01a24888c 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -7,5 +7,8 @@ devstack_localrc target enable_plugin designate https://git.openstack.org/openst devstack_localrc base enable_service designate-api designate-central designate-producer designate-worker designate-mdns designate-agent designate-sink designate horizon devstack_localrc target enable_service designate-api designate-central designate-producer designate-worker designate-mdns designate-agent designate-sink designate horizon +devstack_localrc base USE_PYTHON3=False +devstack_localrc target USE_PYTHON3=False + BASE_RUN_SMOKE=False TARGET_RUN_SMOKE=False