diff options
| author | Waldemar Znoinski <wznoinsk@redhat.com> | 2019-12-06 12:43:44 +0000 |
|---|---|---|
| committer | Thanh Ha <zxiiro@gmail.com> | 2019-12-13 14:38:32 -0500 |
| commit | 2ea9841a9696d7e8c7cc9281dfd8de4498926090 (patch) | |
| tree | 0e84f0415c38ae6f9e1d112891b4488dbb54c8d7 | |
| parent | 67dc0087a792c5f77c8560d6ef1f31d61275f056 (diff) | |
| download | python-jenkins-job-builder-2ea9841a9696d7e8c7cc9281dfd8de4498926090.tar.gz python-jenkins-job-builder-2ea9841a9696d7e8c7cc9281dfd8de4498926090.tar.xz python-jenkins-job-builder-2ea9841a9696d7e8c7cc9281dfd8de4498926090.zip | |
Add support for noSquash (no-squash) in jms-messaging trigger
It's sometimes required to trigger a job build on every CI message.
To achieve that the XML's noSquash (jjb: no-squash) has to be set to
True.
see triggers section at:
https://wiki.jenkins.io/display/JENKINS/JMS+Messaging+Plugin
Change-Id: I389e59cca4f649379614f7f6247bf76cf4a0ba95
| -rw-r--r-- | jenkins_jobs/modules/triggers.py | 7 | ||||
| -rw-r--r-- | tests/triggers/fixtures/jms-messaging001.xml | 1 | ||||
| -rw-r--r-- | tests/triggers/fixtures/jms-messaging001.yaml | 1 | ||||
| -rw-r--r-- | tests/triggers/fixtures/jms-messaging002.xml | 1 |
4 files changed, 10 insertions, 0 deletions
diff --git a/jenkins_jobs/modules/triggers.py b/jenkins_jobs/modules/triggers.py index 21d9a7a3..c8b6b715 100644 --- a/jenkins_jobs/modules/triggers.py +++ b/jenkins_jobs/modules/triggers.py @@ -933,6 +933,12 @@ def jms_messaging(registry, xml_parent, data): Requires the Jenkins :jenkins-wiki:`JMS Messaging Plugin <JMS+Messaging+Plugin>`. + :arg bool no-squash: true = schedule a new job for every triggering message. + (default false) + Normally if a job is queued and another triggering message is received, a new job + is not submitted and the job is "squashed" into the job already queued. + Setting this option to 'True' forces a new job to be submitted for every triggering + message that is received. :arg str override-topic: If you need to override the default topic. (default '') :arg str selector: The JSON or YAML formatted text that conforms to @@ -968,6 +974,7 @@ def jms_messaging(registry, xml_parent, data): mapping = [ # option, xml name, default value ("spec", "spec", ""), + ("no-squash", "noSquash", False), ("selector", "selector", ""), ("provider-name", "providerName", ""), ] diff --git a/tests/triggers/fixtures/jms-messaging001.xml b/tests/triggers/fixtures/jms-messaging001.xml index 3d1e91e6..02ac8aa8 100644 --- a/tests/triggers/fixtures/jms-messaging001.xml +++ b/tests/triggers/fixtures/jms-messaging001.xml @@ -3,6 +3,7 @@ <triggers class="vector"> <com.redhat.jenkins.plugins.ci.CIBuildTrigger> <spec/> + <noSquash>true</noSquash> <selector>topic = "org.fedoraproject.prod.fedimg.image.upload"</selector> <providerName>fedmsg</providerName> <checks> diff --git a/tests/triggers/fixtures/jms-messaging001.yaml b/tests/triggers/fixtures/jms-messaging001.yaml index 2e9d4b77..b93b401f 100644 --- a/tests/triggers/fixtures/jms-messaging001.yaml +++ b/tests/triggers/fixtures/jms-messaging001.yaml @@ -1,5 +1,6 @@ triggers: - jms-messaging: + no-squash: True selector: topic = "org.fedoraproject.prod.fedimg.image.upload" provider-name: fedmsg checks: diff --git a/tests/triggers/fixtures/jms-messaging002.xml b/tests/triggers/fixtures/jms-messaging002.xml index 4bc5ad6a..a73fb8b1 100644 --- a/tests/triggers/fixtures/jms-messaging002.xml +++ b/tests/triggers/fixtures/jms-messaging002.xml @@ -3,6 +3,7 @@ <triggers class="vector"> <com.redhat.jenkins.plugins.ci.CIBuildTrigger> <spec/> + <noSquash>false</noSquash> <selector>topic = "org.fedoraproject.prod.fedimg.image.upload"</selector> <providerName>fedmsg</providerName> </com.redhat.jenkins.plugins.ci.CIBuildTrigger> |