From 28e43831e9facb5bdd1169f3af845aad5bf0c717 Mon Sep 17 00:00:00 2001
From: Eren ATAS <eatas.contractor@libertyglobal.com>
Date: Fri, 5 Jun 2020 14:01:11 +0200
Subject: Added topic-changed-event on triggers.py

Depends on https://review.opendev.org/#/c/731169/

Change-Id: I8d1ed67b11e1ff1fcf13325108c007d6baff07c4
Signed-off-by: Eren ATAS <eatas.contractor@libertyglobal.com>
---
 jenkins_jobs/modules/triggers.py                   |  5 +-
 .../fixtures/gerrit028-trigger-simple-triggers.xml | 64 ++++++++++++++++++++++
 .../gerrit028-trigger-simple-triggers.yaml         | 25 +++++++++
 3 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 tests/triggers/fixtures/gerrit028-trigger-simple-triggers.xml
 create mode 100644 tests/triggers/fixtures/gerrit028-trigger-simple-triggers.yaml

diff --git a/jenkins_jobs/modules/triggers.py b/jenkins_jobs/modules/triggers.py
index 8421fd6b..d6b2d7bb 100644
--- a/jenkins_jobs/modules/triggers.py
+++ b/jenkins_jobs/modules/triggers.py
@@ -154,8 +154,9 @@ def build_gerrit_triggers(xml_parent, data):
         "draft-published-event": "PluginDraftPublishedEvent",
         "patchset-uploaded-event": "PluginPatchsetCreatedEvent",
         "patchset-created-event": "PluginPatchsetCreatedEvent",
-        "ref-updated-event": "PluginRefUpdatedEvent",
         "private-state-changed-event": "PluginPrivateStateChangedEvent",
+        "ref-updated-event": "PluginRefUpdatedEvent",
+        "topic-changed-event": "PluginTopicChangedEvent",
         "wip-state-changed-event": "PluginWipStateChangedEvent",
     }
     tag_namespace = (
@@ -349,6 +350,8 @@ def gerrit(registry, xml_parent, data):
          * **draft-published-event** -- Trigger on draft published event.
          * **ref-updated-event** -- Trigger on ref-updated.
            Gerrit Trigger Plugin version >= 2.29.0
+         * **topic-changed-event** -- Trigger on topic-changed.
+           Gerrit Trigger Plugin version >= 2.26.0
          * **private-state-changed-event** -- Trigger on private state changed event.
          * **wip-state-changed-event** -- Trigger on wip state changed event.
            Gerrit Trigger Plugin version >= 2.8.0
diff --git a/tests/triggers/fixtures/gerrit028-trigger-simple-triggers.xml b/tests/triggers/fixtures/gerrit028-trigger-simple-triggers.xml
new file mode 100644
index 00000000..b5dfea0b
--- /dev/null
+++ b/tests/triggers/fixtures/gerrit028-trigger-simple-triggers.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <triggers class="vector">
+    <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>
+      <spec/>
+      <gerritProjects/>
+      <skipVote>
+        <onSuccessful>false</onSuccessful>
+        <onFailed>false</onFailed>
+        <onUnstable>false</onUnstable>
+        <onNotBuilt>false</onNotBuilt>
+      </skipVote>
+      <silentMode>false</silentMode>
+      <silentStartMode>false</silentStartMode>
+      <escapeQuotes>true</escapeQuotes>
+      <dependencyJobsNames/>
+      <commitMessageParameterMode>BASE64</commitMessageParameterMode>
+      <nameAndEmailParameterMode>PLAIN</nameAndEmailParameterMode>
+      <changeSubjectParameterMode>PLAIN</changeSubjectParameterMode>
+      <commentTextParameterMode>BASE64</commentTextParameterMode>
+      <notificationLevel/>
+      <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration>
+      <triggerConfigURL/>
+      <dynamicGerritProjects class="empty-list"/>
+      <triggerInformationAction/>
+      <triggerOnEvents>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginChangeAbandonedEvent/>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginChangeMergedEvent/>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginChangeRestoredEvent/>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedEvent>
+          <verdictCategory>Code-Review</verdictCategory>
+          <commentAddedTriggerApprovalValue>lorem</commentAddedTriggerApprovalValue>
+        </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedEvent>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedEvent>
+          <verdictCategory>Verified</verdictCategory>
+          <commentAddedTriggerApprovalValue>ipsum</commentAddedTriggerApprovalValue>
+        </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedEvent>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedContainsEvent>
+          <commentAddedCommentContains>dolor</commentAddedCommentContains>
+        </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedContainsEvent>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginDraftPublishedEvent/>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent>
+          <excludeDrafts>true</excludeDrafts>
+          <excludeTrivialRebase>false</excludeTrivialRebase>
+          <excludeNoCodeChange>true</excludeNoCodeChange>
+          <excludePrivateState>false</excludePrivateState>
+          <excludeWipState>true</excludeWipState>
+        </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPrivateStateChangedEvent/>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginRefUpdatedEvent/>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginTopicChangedEvent/>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginWipStateChangedEvent/>
+      </triggerOnEvents>
+      <buildStartMessage/>
+      <buildFailureMessage/>
+      <buildSuccessfulMessage/>
+      <buildUnstableMessage/>
+      <buildNotBuiltMessage/>
+      <buildUnsuccessfulFilepath/>
+      <customUrl/>
+      <serverName>__ANY__</serverName>
+    </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>
+  </triggers>
+</project>
diff --git a/tests/triggers/fixtures/gerrit028-trigger-simple-triggers.yaml b/tests/triggers/fixtures/gerrit028-trigger-simple-triggers.yaml
new file mode 100644
index 00000000..0fd18c0a
--- /dev/null
+++ b/tests/triggers/fixtures/gerrit028-trigger-simple-triggers.yaml
@@ -0,0 +1,25 @@
+triggers:
+  - gerrit:
+      trigger-on:
+        - change-abandoned-event
+        - change-merged-event
+        - change-restored-event
+        - comment-added-event:
+            approval-category: Code-Review
+            approval-value: lorem
+        - comment-added-event:
+            approval-category: Verified
+            approval-value: ipsum
+        - comment-added-contains-event:
+            comment-contains-value: dolor
+        - draft-published-event
+        - patchset-created-event:
+            exclude-drafts: true
+            exclude-no-code-change: true
+            exclude-private: false
+            exclude-trivial-rebase: false
+            exclude-wip: true
+        - private-state-changed-event
+        - ref-updated-event
+        - topic-changed-event
+        - wip-state-changed-event
-- 
cgit