summaryrefslogtreecommitdiff
path: root/tests/fixtures
diff options
context:
space:
mode:
authorSimon Westphahl <simon.westphahl@bmw.de>2022-06-02 11:14:02 +0200
committerSimon Westphahl <simon.westphahl@bmw.de>2022-06-02 16:05:05 +0200
commit124058d2ff63d2c332d60f58e97c3d6427e86bea (patch)
treee16e2b456881000b6bb6edd5ff672bde7b2e8e32 /tests/fixtures
parent7842e3fcf10e116ca47cfffbd82022802b53432d (diff)
downloadzuul-124058d2ff63d2c332d60f58e97c3d6427e86bea.tar.gz
Fix relative prio for project configs w/o jobs
When a project configuration defined a queue, but did not directly specify any pipeline configuration (e.g. only referenced templates), the relative priority queues were not setup correctly. This could happen in pipelines using the independent and supercedent manager. Other pipelines using the shared change queue mixin handle this correctly. This edge case will be tested in `test_scheduler.TestScheduler.test_nodepool_relative_priority_check` by slightly modifying the config to use a template for one of the projects. Change-Id: I1f682e6593ccdad3cfacf5817fc1a1cf7de8856b
Diffstat (limited to 'tests/fixtures')
-rw-r--r--tests/fixtures/layouts/two-projects-integrated.yaml16
1 files changed, 12 insertions, 4 deletions
diff --git a/tests/fixtures/layouts/two-projects-integrated.yaml b/tests/fixtures/layouts/two-projects-integrated.yaml
index 45c726e4f..89302f62a 100644
--- a/tests/fixtures/layouts/two-projects-integrated.yaml
+++ b/tests/fixtures/layouts/two-projects-integrated.yaml
@@ -58,18 +58,26 @@
jobs:
- test
-- project:
- name: org/project1
+# Define jobs for org/project1 in a template to test that the queue name is
+# picked up correctly from the project config. This should also be the case
+# when the project doesn't include any pipeline config and only references a
+# template.
+- project-template:
+ name: project1-template
check:
- queue: integrated
jobs:
- integration
gate:
- queue: integrated
jobs:
- integration
- project:
+ name: org/project1
+ queue: integrated
+ templates:
+ - project1-template
+
+- project:
name: org/project2
check:
queue: integrated