openstack/requirements
Code Issues Proposed changes

Set tox_constraints_file for cross-jobs

Browse Source 
In the follow-on job I268fb7e1dc753c82983736572b3df2f152f8cf51 I have
modified upper-constraints.txt but it seems like the cross-horizon-npm
is still trying to use the constraints from releases.openstack.org, so
not picking up the change in the gate.

It seems that horizon calls "tox -e npm" as part of it's npm magic,
but doesn't use the checked-out version of upper-constraints.txt.

The dependent patch uses tox_constraints_file to set
UPPER_CONSTRAINTS_FILE, which should hopefully pick up the right
installation candidates.

This should allow the job to become voting again.

Depends-On: https://review.opendev.org/709414
Change-Id: Id9a465bd106940a1e286e8090be2186becc1c9f0
This commit is contained in:
Ian Wienand 2020-02-24 17:14:23 +11:00 committed by Dr. Jens Harbott
parent 7d5bea2164
commit cbd4a2f0cf
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.d/cross-jobs.yaml
View File

@ -16,6 +16,7 @@
nodeset: ubuntu-bionic nodeset: ubuntu-bionic
vars: vars:
zuul_work_dir: "{{ (zuul.projects.values() | selectattr('required') | selectattr('name', 'match', '^(?!openstack/requirements)') | list)[0].src_dir }}" zuul_work_dir: "{{ (zuul.projects.values() | selectattr('required') | selectattr('name', 'match', '^(?!openstack/requirements)') | list)[0].src_dir }}"
tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt"
files: files:
- upper-constraints.txt - upper-constraints.txt
- .zuul.d/cross-jobs.yaml - .zuul.d/cross-jobs.yaml
@ -37,6 +38,7 @@
Use the specified tox environments (``ALL`` selects all). Use the specified tox environments (``ALL`` selects all).
vars: vars:
zuul_work_dir: "{{ (zuul.projects.values() | selectattr('required') | selectattr('name', 'match', '^(?!openstack/requirements)') | list)[0].src_dir }}" zuul_work_dir: "{{ (zuul.projects.values() | selectattr('required') | selectattr('name', 'match', '^(?!openstack/requirements)') | list)[0].src_dir }}"
tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt"
files: files:
- upper-constraints.txt - upper-constraints.txt
- .zuul.d/cross-jobs.yaml - .zuul.d/cross-jobs.yaml

4
.zuul.d/project.yaml
View File

@ -22,8 +22,7 @@
- cross-cinder-py36 - cross-cinder-py36
- cross-glance-py36 - cross-glance-py36
- cross-horizon-py36 - cross-horizon-py36
- cross-horizon-npm: - cross-horizon-npm
voting: false
- cross-keystone-py36 - cross-keystone-py36
- cross-neutron-py36 - cross-neutron-py36
- cross-nova-py36 - cross-nova-py36
@ -65,6 +64,7 @@
- cross-cinder-py36 - cross-cinder-py36
- cross-glance-py36 - cross-glance-py36
- cross-horizon-py36 - cross-horizon-py36
- cross-horizon-npm
- cross-keystone-py36 - cross-keystone-py36
- cross-neutron-py36 - cross-neutron-py36
- cross-nova-py36: - cross-nova-py36: