From 7f26bfcbb1f88f81c022940a4068321b1cda1c3c Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Tue, 24 Mar 2020 15:36:48 +0900 Subject: [PATCH] Set tox_constraints_file for npm jobs and integration tests npm jobs and integration tests always try to use the constraints from releases.openstack.org and do not pick up the change in the gate even when Depends-On is specified. For npm jobs, https://review.opendev.org/#/c/709414/ allows us to pass tox_constraints_file when creating the envvar of the constraints file. This commit consumes it. Change-Id: I396073182ff1e63df12ebb79c3ddd646277ddadf --- .zuul.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 4f29563c04..1490de7c3e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -51,6 +51,9 @@ post-run: playbooks/horizon-devstack-integration/post.yaml roles: - zuul: openstack-infra/devstack + required-projects: + - openstack/horizon + - openstack/requirements irrelevant-files: - ^.*\.rst$ - ^doc/.*$ @@ -69,6 +72,7 @@ devstack_services: horizon: true tox_envlist: integration + tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt" - job: name: horizon-dsvm-tempest-plugin @@ -132,9 +136,11 @@ Run lint using Node 10 for horizon plugins. vars: node_version: 10 + tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt" nodeset: ubuntu-bionic required-projects: - openstack/horizon + - openstack/horizon + - openstack/requirements - job: name: nodejs10-npm-run-test @@ -143,9 +149,11 @@ Run test using Node 10 for horizon plugins. vars: node_version: 10 + tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt" nodeset: ubuntu-bionic required-projects: - openstack/horizon + - openstack/horizon + - openstack/requirements - project-template: name: horizon-nodejs10-jobs