Merge "hipchat_notif: Fix compatibility dispatch"

jenkins_jobs/modules/hipchat_notif.py

@@ -145,7 +145,8 @@ class HipChat(jenkins_jobs.modules.base.Base):
                 "'hipchat' module supports the old plugin versions <1.9, "
                 "newer versions are supported via the 'publishers' module. "
                 "Please upgrade you job definition")
-            return self.registry.dispatch('publisher', publishers, data)
+            component = {'hipchat': hipchat}
+            return self.registry.dispatch('publisher', publishers, component)
         else:
             properties = xml_parent.find('properties')
             if properties is None:

tests/yamlparser/fixtures/hipchat1.plugins_info.yaml

@@ -0,0 +1,3 @@
+- longName: 'Jenkins HipChat Plugin'
+  shortName: 'hipchat'
+  version: "2.1.1"

tests/yamlparser/fixtures/hipchat1.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <actions/>
+  <description>desc&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <canRoam>true</canRoam>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <builders/>
+  <publishers>
+    <jenkins.plugins.hipchat.HipChatNotifier>
+      <token/>
+      <room>room1</room>
+      <startNotification>true</startNotification>
+      <notifySuccess>false</notifySuccess>
+      <notifyAborted>false</notifyAborted>
+      <notifyNotBuilt>false</notifyNotBuilt>
+      <notifyUnstable>false</notifyUnstable>
+      <notifyFailure>false</notifyFailure>
+      <notifyBackToNormal>false</notifyBackToNormal>
+    </jenkins.plugins.hipchat.HipChatNotifier>
+  </publishers>
+  <buildWrappers/>
+</project>

tests/yamlparser/fixtures/hipchat1.yaml

@@ -0,0 +1,17 @@
+- defaults:
+    name: global
+    project-type: freestyle
+    description: desc
+
+- project:
+    name: hipchat1
+    jobs:
+        - 'hipchat1-tpl'
+
+- job-template:
+    name: 'hipchat1-tpl'
+    scm: []
+    hipchat:
+        enabled: true
+        rooms: [room1]
+        notify-start: true