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