Skip to content

Commit 4387bb8

Browse files
mawinter69mawinter69
committed
Merge branch 'master' into ui-refresh
2 parents 0fb2141 + 20643d8 commit 4387bb8

File tree

7 files changed

+64
-56
lines changed

7 files changed

+64
-56
lines changed

‎src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/config/Config.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -334,27 +334,33 @@ public void setValues(JSONObject formData) {
334334

335335
gerritVerifiedCmdBuildStarted = formData.optString(
336336
"gerritVerifiedCmdBuildStarted",
337-
"gerrit review <CHANGE>,<PATCHSET> --message 'Build Started <BUILDURL> <STARTED_STATS>' "
337+
"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
338+
+ "--message 'Build Started <BUILDURL> <STARTED_STATS>' "
338339
+ "--verified <VERIFIED> --code-review <CODE_REVIEW> --tag " + Constants.TAG_VALUE);
339340
gerritVerifiedCmdBuildFailed = formData.optString(
340341
"gerritVerifiedCmdBuildFailed",
341-
"gerrit review <CHANGE>,<PATCHSET> --message 'Build Failed <BUILDS_STATS>' "
342+
"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
343+
+ "--message 'Build Failed <BUILDS_STATS>' "
342344
+ "--verified <VERIFIED> --code-review <CODE_REVIEW> --tag " + Constants.TAG_VALUE);
343345
gerritVerifiedCmdBuildSuccessful = formData.optString(
344346
"gerritVerifiedCmdBuildSuccessful",
345-
"gerrit review <CHANGE>,<PATCHSET> --message 'Build Successful <BUILDS_STATS>' "
347+
"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
348+
+ "--message 'Build Successful <BUILDS_STATS>' "
346349
+ "--verified <VERIFIED> --code-review <CODE_REVIEW> --tag " + Constants.TAG_VALUE);
347350
gerritVerifiedCmdBuildUnstable = formData.optString(
348351
"gerritVerifiedCmdBuildUnstable",
349-
"gerrit review <CHANGE>,<PATCHSET> --message 'Build Unstable <BUILDS_STATS>' "
352+
"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
353+
+ "--message 'Build Unstable <BUILDS_STATS>' "
350354
+ "--verified <VERIFIED> --code-review <CODE_REVIEW> --tag " + Constants.TAG_VALUE);
351355
gerritVerifiedCmdBuildNotBuilt = formData.optString(
352356
"gerritVerifiedCmdBuildNotBuilt",
353-
"gerrit review <CHANGE>,<PATCHSET> --message 'No Builds Executed <BUILDS_STATS>' "
357+
"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
358+
+ "--message 'No Builds Executed <BUILDS_STATS>' "
354359
+ "--verified <VERIFIED> --code-review <CODE_REVIEW> --tag " + Constants.TAG_VALUE);
355360
gerritVerifiedCmdBuildAborted = formData.optString(
356361
"gerritVerifiedCmdBuildAborted",
357-
"gerrit review <CHANGE>,<PATCHSET> --message 'Build Aborted <BUILDS_STATS>' "
362+
"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
363+
+ "--message 'Build Aborted <BUILDS_STATS>' "
358364
+ "--verified <VERIFIED> --code-review <CODE_REVIEW> --tag " + Constants.TAG_VALUE);
359365
gerritFrontEndUrl = formData.optString(
360366
"gerritFrontEndUrl",

‎src/main/resources/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritServer/index.jelly‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,37 +213,37 @@
213213
help="/plugin/gerrit-trigger/help-GerritVerifiedCmdBuildStarted.html">
214214
<f:textarea name="gerritVerifiedCmdBuildStarted"
215215
value="${it.config.gerritCmdBuildStarted}"
216-
default="gerrit review &lt;CHANGE&gt;,&lt;PATCHSET&gt; --message 'Build Started &lt;BUILDURL&gt; &lt;STARTED_STATS&gt;' --verified &lt;VERIFIED&gt; --code-review &lt;CODE_REVIEW&gt;"/>
216+
default="gerrit review --project &lt;GERRIT_NAME&gt; &lt;CHANGE&gt;,&lt;PATCHSET&gt; --message 'Build Started &lt;BUILDURL&gt; &lt;STARTED_STATS&gt;' --verified &lt;VERIFIED&gt; --code-review &lt;CODE_REVIEW&gt;"/>
217217
</f:entry>
218218
<f:entry title="${%Successful}"
219219
help="/plugin/gerrit-trigger/help-GerritVerifiedCmdBuildSuccessful.html">
220220
<f:textarea name="gerritVerifiedCmdBuildSuccessful"
221221
value="${it.config.gerritCmdBuildSuccessful}"
222-
default="gerrit review &lt;CHANGE&gt;,&lt;PATCHSET&gt; --message 'Build Successful &lt;BUILDS_STATS&gt;' --verified &lt;VERIFIED&gt; --code-review &lt;CODE_REVIEW&gt;"/>
222+
default="gerrit review --project &lt;GERRIT_NAME&gt; &lt;CHANGE&gt;,&lt;PATCHSET&gt; --message 'Build Successful &lt;BUILDS_STATS&gt;' --verified &lt;VERIFIED&gt; --code-review &lt;CODE_REVIEW&gt;"/>
223223
</f:entry>
224224
<f:entry title="${%Failed}"
225225
help="/plugin/gerrit-trigger/help-GerritVerifiedCmdBuildFailed.html">
226226
<f:textarea name="gerritVerifiedCmdBuildFailed"
227227
value="${it.config.gerritCmdBuildFailed}"
228-
default="gerrit review &lt;CHANGE&gt;,&lt;PATCHSET&gt; --message 'Build Failed &lt;BUILDS_STATS&gt;' --verified &lt;VERIFIED&gt; --code-review &lt;CODE_REVIEW&gt;"/>
228+
default="gerrit review --project &lt;GERRIT_NAME&gt; &lt;CHANGE&gt;,&lt;PATCHSET&gt; --message 'Build Failed &lt;BUILDS_STATS&gt;' --verified &lt;VERIFIED&gt; --code-review &lt;CODE_REVIEW&gt;"/>
229229
</f:entry>
230230
<f:entry title="${%Unstable}"
231231
help="/plugin/gerrit-trigger/help-GerritVerifiedCmdBuildUnstable.html">
232232
<f:textarea name="gerritVerifiedCmdBuildUnstable"
233233
value="${it.config.gerritCmdBuildUnstable}"
234-
default="gerrit review &lt;CHANGE&gt;,&lt;PATCHSET&gt; --message 'Build Unstable &lt;BUILDS_STATS&gt;' --verified &lt;VERIFIED&gt; --code-review &lt;CODE_REVIEW&gt;"/>
234+
default="gerrit review --project &lt;GERRIT_NAME&gt; &lt;CHANGE&gt;,&lt;PATCHSET&gt; --message 'Build Unstable &lt;BUILDS_STATS&gt;' --verified &lt;VERIFIED&gt; --code-review &lt;CODE_REVIEW&gt;"/>
235235
</f:entry>
236236
<f:entry title="${%Not Built}"
237237
help="/plugin/gerrit-trigger/help-GerritVerifiedCmdBuildNotBuilt.html">
238238
<f:textarea name="gerritVerifiedCmdBuildNotBuilt"
239239
value="${it.config.gerritCmdBuildNotBuilt}"
240-
default="gerrit review &lt;CHANGE&gt;,&lt;PATCHSET&gt; --message 'No Builds Executed &lt;BUILDS_STATS&gt;' --verified &lt;VERIFIED&gt; --code-review &lt;CODE_REVIEW&gt;"/>
240+
default="gerrit review --project &lt;GERRIT_NAME&gt; &lt;CHANGE&gt;,&lt;PATCHSET&gt; --message 'No Builds Executed &lt;BUILDS_STATS&gt;' --verified &lt;VERIFIED&gt; --code-review &lt;CODE_REVIEW&gt;"/>
241241
</f:entry>
242242
<f:entry title="${%Aborted}"
243243
help="/plugin/gerrit-trigger/help-GerritVerifiedCmdBuildAborted.html">
244244
<f:textarea name="gerritVerifiedCmdBuildAborted"
245245
value="${it.config.gerritCmdBuildAborted}"
246-
default="gerrit review &lt;CHANGE&gt;,&lt;PATCHSET&gt; --message 'Build Aborted &lt;BUILDS_STATS&gt;' --verified &lt;VERIFIED&gt; --code-review &lt;CODE_REVIEW&gt;"/>
246+
default="gerrit review --project &lt;GERRIT_NAME&gt; &lt;CHANGE&gt;,&lt;PATCHSET&gt; --message 'Build Aborted &lt;BUILDS_STATS&gt;' --verified &lt;VERIFIED&gt; --code-review &lt;CODE_REVIEW&gt;"/>
247247
</f:entry>
248248
</f:section>
249249
<f:section title="${%Miscellaneous}">

‎src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/config/ConfigTest.java‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,18 @@ public class ConfigTest {
6363
*/
6464
@Test
6565
public void testSetValues() {
66-
String formString = "{\"gerritVerifiedCmdBuildFailed\":\"gerrit review <CHANGE>,<PATCHSET> "
66+
String formString = "{\"gerritVerifiedCmdBuildFailed\":"
67+
+ "\"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
6768
+ "--message 'Failed misserably <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>\","
68-
+ "\"gerritVerifiedCmdBuildStarted\":\"gerrit review <CHANGE>,<PATCHSET> "
69+
+ "\"gerritVerifiedCmdBuildStarted\":\"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
6970
+ "--message 'Started yay!! <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>\","
70-
+ "\"gerritVerifiedCmdBuildSuccessful\":\"gerrit review <CHANGE>,<PATCHSET>"
71+
+ "\"gerritVerifiedCmdBuildSuccessful\":\"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET>"
7172
+ " --message 'Successful wonderful <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>\","
72-
+ "\"gerritVerifiedCmdBuildUnstable\":\"gerrit review <CHANGE>,<PATCHSET> "
73+
+ "\"gerritVerifiedCmdBuildUnstable\":\"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
7374
+ "--message 'Unstable and you are to <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>\","
74-
+ "\"gerritVerifiedCmdBuildNotBuilt\":\"gerrit review <CHANGE>,<PATCHSET> "
75+
+ "\"gerritVerifiedCmdBuildNotBuilt\":\"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
7576
+ "--message 'You are not built for it <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>\","
76-
+ "\"gerritVerifiedCmdBuildAborted\":\"gerrit review <CHANGE>,<PATCHSET> "
77+
+ "\"gerritVerifiedCmdBuildAborted\":\"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
7778
+ "--message 'Aborted oupsy <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>\","
7879
+ "\"gerritAuthKeyFile\":\"/home/local/gerrit/.ssh/id_rsa\","
7980
+ "\"gerritAuthKeyFilePassword\":\"passis\","
@@ -100,24 +101,24 @@ public void testSetValues() {
100101
+ "\"notificationLevel\":\"OWNER\"}";
101102
JSONObject form = (JSONObject)JSONSerializer.toJSON(formString);
102103
Config config = new Config(form);
103-
assertEquals("gerrit review <CHANGE>,<PATCHSET> "
104+
assertEquals("gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
104105
+ "--message 'Failed misserably <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>",
105106
config.getGerritCmdBuildFailed());
106-
assertEquals("gerrit review <CHANGE>,<PATCHSET> "
107+
assertEquals("gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
107108
+ "--message 'Started yay!! <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>",
108109
config.getGerritCmdBuildStarted());
109-
assertEquals("gerrit review <CHANGE>,<PATCHSET>"
110+
assertEquals("gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET>"
110111
+ " --message 'Successful wonderful <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>",
111112
config.getGerritCmdBuildSuccessful());
112-
assertEquals("gerrit review <CHANGE>,<PATCHSET> "
113+
assertEquals("gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
113114
+ "--message 'Unstable and you are to <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>",
114115
config.getGerritCmdBuildUnstable());
115-
assertEquals("gerrit review <CHANGE>,<PATCHSET> "
116+
assertEquals("gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
116117
+ "--message 'You are not built for it <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>",
117118
config.getGerritCmdBuildNotBuilt());
118-
assertEquals("gerrit review <CHANGE>,<PATCHSET> "
119-
+ "--message 'Aborted oupsy <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>",
120-
config.getGerritCmdBuildAborted());
119+
assertEquals("gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
120+
+ "--message 'Aborted oupsy <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>",
121+
config.getGerritCmdBuildAborted());
121122
assertEquals(new File("/home/local/gerrit/.ssh/id_rsa").getPath(),
122123
config.getGerritAuthKeyFile().getPath());
123124
assertEquals("passis", config.getGerritAuthKeyFilePassword());
@@ -167,17 +168,18 @@ public void testProjectListRefreshIntervalZeroValue() {
167168
*/
168169
@Test
169170
public void testCopyConfig() {
170-
String formString = "{\"gerritVerifiedCmdBuildFailed\":\"gerrit review <CHANGE>,<PATCHSET> "
171+
String formString = "{\"gerritVerifiedCmdBuildFailed\":"
172+
+ "\"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
171173
+ "--message 'Failed misserably <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>\","
172-
+ "\"gerritVerifiedCmdBuildStarted\":\"gerrit review <CHANGE>,<PATCHSET> "
174+
+ "\"gerritVerifiedCmdBuildStarted\":\"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
173175
+ "--message 'Started yay!! <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>\","
174-
+ "\"gerritVerifiedCmdBuildSuccessful\":\"gerrit review <CHANGE>,<PATCHSET>"
176+
+ "\"gerritVerifiedCmdBuildSuccessful\":\"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET>"
175177
+ " --message 'Successful wonderful <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>\","
176-
+ "\"gerritVerifiedCmdBuildUnstable\":\"gerrit review <CHANGE>,<PATCHSET> "
178+
+ "\"gerritVerifiedCmdBuildUnstable\":\"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
177179
+ "--message 'Unstable and you are to <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>\","
178-
+ "\"gerritVerifiedCmdBuildNotBuilt\":\"gerrit review <CHANGE>,<PATCHSET> "
180+
+ "\"gerritVerifiedCmdBuildNotBuilt\":\"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
179181
+ "--message 'You are not built for it <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>\","
180-
+ "\"gerritVerifiedCmdBuildAborted\":\"gerrit review <CHANGE>,<PATCHSET> "
182+
+ "\"gerritVerifiedCmdBuildAborted\":\"gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
181183
+ "--message 'Aborted oupsy <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>\","
182184
+ "\"gerritAuthKeyFile\":\"/home/local/gerrit/.ssh/id_rsa\","
183185
+ "\"gerritAuthKeyFilePassword\":\"passis\","
@@ -205,22 +207,22 @@ public void testCopyConfig() {
205207
JSONObject form = (JSONObject)JSONSerializer.toJSON(formString);
206208
Config initialConfig = new Config(form);
207209
Config config = new Config(initialConfig);
208-
assertEquals("gerrit review <CHANGE>,<PATCHSET> "
210+
assertEquals("gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
209211
+ "--message 'Failed misserably <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>",
210212
config.getGerritCmdBuildFailed());
211-
assertEquals("gerrit review <CHANGE>,<PATCHSET> "
213+
assertEquals("gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
212214
+ "--message 'Started yay!! <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>",
213215
config.getGerritCmdBuildStarted());
214-
assertEquals("gerrit review <CHANGE>,<PATCHSET>"
216+
assertEquals("gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET>"
215217
+ " --message 'Successful wonderful <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>",
216218
config.getGerritCmdBuildSuccessful());
217-
assertEquals("gerrit review <CHANGE>,<PATCHSET> "
219+
assertEquals("gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
218220
+ "--message 'Unstable and you are to <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>",
219221
config.getGerritCmdBuildUnstable());
220-
assertEquals("gerrit review <CHANGE>,<PATCHSET> "
222+
assertEquals("gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
221223
+ "--message 'You are not built for it <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>",
222224
config.getGerritCmdBuildNotBuilt());
223-
assertEquals("gerrit review <CHANGE>,<PATCHSET> "
225+
assertEquals("gerrit review --project <GERRIT_NAME> <CHANGE>,<PATCHSET> "
224226
+ "--message 'Aborted oupsy <BUILDURL>' --verified <VERIFIED> --code-review <CODE_REVIEW>",
225227
config.getGerritCmdBuildAborted());
226228
assertEquals(new File("/home/local/gerrit/.ssh/id_rsa").getPath(),

‎src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/spec/VoteSameTopicTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,10 @@ public void testVoteSameTopic() throws Exception {
165165
//CS IGNORE MagicNumber FOR NEXT 4 LINES. REASON: Testdata.
166166
server.waitForCommand("gerrit stream-events", 2000);
167167
triggerAndWait(projects[0]);
168-
checkCommand("gerrit review 100,1 --message 'Build Started[\\s\\S.]*");
169-
checkCommand("gerrit review 101,1 --message 'Build Started[\\s\\S.]*");
170-
checkCommand("gerrit review 100,1 --message 'Build Successful[\\s\\S.]*");
171-
checkCommand("gerrit review 101,1 --message 'Build Successful[\\s\\S.]*");
168+
checkCommand("gerrit review --project " + projects[0] + " 100,1 --message 'Build Started[\\s\\S.]*");
169+
checkCommand("gerrit review --project " + projects[1] + " 101,1 --message 'Build Started[\\s\\S.]*");
170+
checkCommand("gerrit review --project " + projects[0] + " 100,1 --message 'Build Successful[\\s\\S.]*");
171+
checkCommand("gerrit review --project " + projects[1] + " 101,1 --message 'Build Successful[\\s\\S.]*");
172172
}
173173

174174
/**

0 commit comments

Comments
 (0)