EIB: Jenkins job not getting triggered after version uplift to 2.222.3 (#474)

* [DURACI 20476] EIB: Jenkibs job not getting triggered after jenkins uplift to 2.222.3

* [DURACI 20476] EIB: Jenkibs job not getting triggered after jenkins uplift to 2.222.3

Co-authored-by: Suryakumari Kolli <suryakumari.kolli@ericsson.com>

Author: Surya-Kolli

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.ericsson</groupId>
     <artifactId>eiffel-intelligence</artifactId>
-    <version>2.2.3</version>
+    <version>2.2.4</version>
     <packaging>war</packaging>
 
     <parent>

src/main/java/com/ericsson/ei/notifications/JenkinsCrumb.java

@@ -95,7 +95,14 @@ public JsonNode fetchJenkinsCrumb(String encoding, String url)
      */
     private URL buildJenkinsCrumbUrl(String url) throws MalformedURLException {
         String baseUrl = urlParser.extractBaseUrl(url);
-        URL jenkinsCrumbUrl = new URL(baseUrl + JENKINS_CRUMB_ENDPOINT);
+        String contextPath = urlParser.extractContextPath(url).split("/")[1];
+        URL jenkinsCrumbUrl;
+        if (contextPath.equals("job")) {
+            jenkinsCrumbUrl = new URL(baseUrl + JENKINS_CRUMB_ENDPOINT);
+        } else {
+            String jenkinsBaseUrl = String.format("%s/%s", baseUrl, contextPath);
+            jenkinsCrumbUrl = new URL(jenkinsBaseUrl + JENKINS_CRUMB_ENDPOINT);
+        }
         return jenkinsCrumbUrl;
     }
 }

src/main/java/com/ericsson/ei/notifications/UrlParser.java

@@ -104,7 +104,7 @@ public String extractBaseUrl(String url) throws MalformedURLException {
      * @throws MalformedURLException
      * @throws URISyntaxException
      */
-    private String extractContextPath(String url) throws MalformedURLException {
+    public String extractContextPath(String url) throws MalformedURLException {
         URL absoluteUrl = new URL(url);
         String contextPath = absoluteUrl.getPath();
         return contextPath;

src/test/java/com/ericsson/ei/notifications/JenkinsCrumbTest.java

@@ -42,7 +42,8 @@ public class JenkinsCrumbTest {
 
     private static final String URL = "http://www.somehot.com/some-endpoint/";
     private static final String BASE_URL = "http://www.somehot.com";
-    private static final String JENKINS_CRUMB_URL = "http://www.somehot.com/crumbIssuer/api/json";
+    private static final String CONTEXT_PATH = "/some-endpoint";
+    private static final String JENKINS_CRUMB_URL = "http://www.somehot.com/some-endpoint/crumbIssuer/api/json";
     private static final String USERNAME = "username";
     private static final String PASSWORD = "password";
 
@@ -65,6 +66,7 @@ public class JenkinsCrumbTest {
     public void beforeTests() throws IOException {
         encoding = Base64.getEncoder().encodeToString((USERNAME + ":" + PASSWORD).getBytes());
         when(urlParser.extractBaseUrl(URL)).thenReturn(BASE_URL);
+        when(urlParser.extractContextPath(URL)).thenReturn(CONTEXT_PATH);
 
         headers.add("Authorization", "Basic " + encoding);
         headers.setContentType(MediaType.APPLICATION_JSON);