Add queue-name parameter to job
Allow an optional queue-name parameter to be set for a job.
As projects with that job are combined with others into shared
change queues, give the queue that name. This allows us to, say,
set the queue name of the tempest gate job to 'integrated' and
end up with the shared change queue of all the OpenStack integrated
projects named 'integrated'.
With that, we can do things like emit stats for the 'integrated'
queue.
Change-Id: Iafd218d7cd519312ccbf97de7c070e8d3b82038c
diff --git a/tests/fixtures/layout-bad-queue.yaml b/tests/fixtures/layout-bad-queue.yaml
new file mode 100644
index 0000000..3eb2051
--- /dev/null
+++ b/tests/fixtures/layout-bad-queue.yaml
@@ -0,0 +1,74 @@
+pipelines:
+ - name: check
+ manager: IndependentPipelineManager
+ trigger:
+ gerrit:
+ - event: patchset-created
+ success:
+ gerrit:
+ verified: 1
+ failure:
+ gerrit:
+ verified: -1
+
+ - name: post
+ manager: IndependentPipelineManager
+ trigger:
+ gerrit:
+ - event: ref-updated
+ ref: ^(?!refs/).*$
+
+ - name: gate
+ manager: DependentPipelineManager
+ failure-message: Build failed. For information on how to proceed, see http://wiki.example.org/Test_Failures
+ trigger:
+ gerrit:
+ - event: comment-added
+ approval:
+ - approved: 1
+ success:
+ gerrit:
+ verified: 2
+ submit: true
+ failure:
+ gerrit:
+ verified: -2
+ start:
+ gerrit:
+ verified: 0
+ precedence: high
+
+jobs:
+ - name: project1-project2-integration
+ queue-name: integration
+ - name: project1-test1
+ queue-name: not_integration
+
+projects:
+ - name: org/project1
+ check:
+ - project1-merge:
+ - project1-test1
+ - project1-test2
+ - project1-project2-integration
+ gate:
+ - project1-merge:
+ - project1-test1
+ - project1-test2
+ - project1-project2-integration
+ post:
+ - project1-post
+
+ - name: org/project2
+ check:
+ - project2-merge:
+ - project2-test1
+ - project2-test2
+ - project1-project2-integration
+ gate:
+ - project2-merge:
+ - project2-test1
+ - project2-test2
+ - project1-project2-integration
+ post:
+ - project2-post
diff --git a/tests/fixtures/layout.yaml b/tests/fixtures/layout.yaml
index b1c94de..70e664f 100644
--- a/tests/fixtures/layout.yaml
+++ b/tests/fixtures/layout.yaml
@@ -104,6 +104,8 @@
- '.*-requires'
- name: node-project-test1
parameter-function: select_debian_node
+ - name: project1-project2-integration
+ queue-name: integration
project-templates:
- name: test-one-and-two
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index 9576440..4758155 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -2893,6 +2893,21 @@
self.assertTrue(re.search("project-test2.*SUCCESS", desc))
self.assertTrue(re.search("Reported result.*SUCCESS", desc))
+ def test_queue_names(self):
+ "Test shared change queue names"
+ project1 = self.sched.layout.projects['org/project1']
+ project2 = self.sched.layout.projects['org/project2']
+ q1 = self.sched.layout.pipelines['gate'].getQueue(project1)
+ q2 = self.sched.layout.pipelines['gate'].getQueue(project2)
+ self.assertEqual(q1.name, 'integration')
+ self.assertEqual(q2.name, 'integration')
+
+ self.config.set('zuul', 'layout_config',
+ 'tests/fixtures/layout-bad-queue.yaml')
+ with testtools.ExpectedException(
+ Exception, "More than one name assigned to change queue"):
+ self.sched.reconfigure(self.config)
+
def test_queue_precedence(self):
"Test that queue precedence works"