From 674aaa132015ea01617fc977d6cf58c03d7a6fa3 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 14 Jul 2017 11:38:32 -0500 Subject: [PATCH] Add shade and openstack/requirements to zuulv3 We need a project that follows upper-constraints to test upper-constraints related features of tox jobs. Change-Id: I9e175a77f83d4b85ab22635d38b4826ddb1ae481 --- zuul/main.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/zuul/main.yaml b/zuul/main.yaml index 077d016c4b..3301f7ad75 100644 --- a/zuul/main.yaml +++ b/zuul/main.yaml @@ -5,9 +5,14 @@ config-projects: - openstack-infra/project-config untrusted-projects: + # Order matters, load common job repos first - openstack-infra/zuul-jobs: shadow: openstack-infra/project-config - openstack-infra/openstack-zuul-jobs - openstack-infra/openstack-zuul-roles + # After this point, sorting projects alphabetically will help + # merge conflicts - openstack-infra/nodepool + - openstack-infra/shade - openstack-infra/zuul + - openstack/requirements