diff --git a/.zuul.d/cross-jobs.yaml b/.zuul.d/cross-jobs.yaml index 6b4bb77df0..7ccd3520dc 100644 --- a/.zuul.d/cross-jobs.yaml +++ b/.zuul.d/cross-jobs.yaml @@ -16,6 +16,7 @@ nodeset: ubuntu-bionic vars: 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: - upper-constraints.txt - .zuul.d/cross-jobs.yaml @@ -37,6 +38,7 @@ Use the specified tox environments (``ALL`` selects all). vars: 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: - upper-constraints.txt - .zuul.d/cross-jobs.yaml diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 091c458175..238747d2f1 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -22,8 +22,7 @@ - cross-cinder-py36 - cross-glance-py36 - cross-horizon-py36 - - cross-horizon-npm: - voting: false + - cross-horizon-npm - cross-keystone-py36 - cross-neutron-py36 - cross-nova-py36 @@ -65,6 +64,7 @@ - cross-cinder-py36 - cross-glance-py36 - cross-horizon-py36 + - cross-horizon-npm - cross-keystone-py36 - cross-neutron-py36 - cross-nova-py36: