Fix its-jira init step
Since the introduction of the multi-jira servers in v2.16, the way
the Jira REST-API URL path is composed has changed. The InitJira step
has not been adapted to the new URL syntax and thus was not working
properly.
Remove the trailing slash in the Jira init step when requesting
for the server info and the associated Jira version.
Also the rendering of the version on the init output was incorrect
resulting in unexpanded {} delimiters.
Bug: Issue 10639
Change-Id: I3dd6d520efd7f0e58251e558365e3b5a17d1983f
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/InitJira.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/InitJira.java
index 91cf5b8..e362d3e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/jira/InitJira.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/InitJira.java
@@ -135,7 +135,7 @@
ui.message("*ERROR* Jira returned an empty version number");
return false;
}
- ui.message("[OK] - Jira Ver {}\n", serverInfo.getVersion());
+ ui.message("[OK] - Jira Ver %s\n", serverInfo.getVersion());
return true;
} catch (IOException e) {
ui.message("*FAILED* (%s)\n", e.toString());
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraServerInfoRestApi.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraServerInfoRestApi.java
index 0a64de0..a0a2523 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraServerInfoRestApi.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraServerInfoRestApi.java
@@ -21,7 +21,7 @@
public class JiraServerInfoRestApi extends JiraRestApi<JiraServerInfo> {
public JiraServerInfoRestApi(JiraURL url, String user, String pass) {
- super(url, user, pass, JiraServerInfo.class, "/serverInfo/");
+ super(url, user, pass, JiraServerInfo.class, "/serverInfo");
}
public JiraServerInfo get() throws IOException {
