From 98f2393641439cdde4c6873ca30ef2a4b0679a13 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Wed, 30 Oct 2024 11:44:11 -0700 Subject: [PATCH] Use stable branch upper-constraints till 2023.1 Stable/2023.1 and Unmaintained xena/yoga/zed runs ubuntu-focal jobs and since with [1] py3.8 pins are dropped from master upper-constraints, so these branches can no longer use master constraints with envs running with python3.8. With this patch making these branches to use stable constraints. [1] https://review.opendev.org/c/openstack/requirements/+/925201 [2] https://lists.openstack.org/archives/list/openstack-discuss@\ lists.openstack.org/thread/FOWV4UQZTH4DPDA67QDEROAESYU5Z3LE/ Needed-By: https://review.opendev.org/c/openstack/devstack/+/933704 Related-Bug: #2085886 Change-Id: I8d2ff33384aec93820aa27ad27f1ff9bd7e87098 --- roles/run-tempest/tasks/main.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/run-tempest/tasks/main.yaml b/roles/run-tempest/tasks/main.yaml index 29409c02b0..15b1743275 100644 --- a/roles/run-tempest/tasks/main.yaml +++ b/roles/run-tempest/tasks/main.yaml @@ -25,11 +25,11 @@ target_branch: "{{ zuul.override_checkout }}" when: zuul.override_checkout is defined -- name: Use stable branch upper-constraints till Wallaby +- name: Use stable branch upper-constraints till 2023.1 set_fact: # TOX_CONSTRAINTS_FILE is new name, UPPER_CONSTRAINTS_FILE is old one, best to set both tempest_tox_environment: "{{ tempest_tox_environment | combine({'UPPER_CONSTRAINTS_FILE': stable_constraints_file}) | combine({'TOX_CONSTRAINTS_FILE': stable_constraints_file}) }}" - when: target_branch in ["stable/ocata", "stable/pike", "stable/queens", "stable/rocky", "stable/stein", "stable/train", "stable/ussuri", "unmaintained/victoria", "unmaintained/wallaby"] + when: target_branch in ["stable/ocata", "stable/pike", "stable/queens", "stable/rocky", "stable/stein", "stable/train", "stable/ussuri", "stable/2023.1", "unmaintained/victoria", "unmaintained/wallaby", "unmaintained/xena", "unmaintained/yoga", "unmaintained/zed", "unmaintained/2023.1"] - name: Use Configured upper-constraints for non-master Tempest set_fact: