add armada lookout url to pipeline output

armadaproject · Dec 24, 2024 · b1a48e6 · b1a48e6
1 parent a887415
commit b1a48e6
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -49,7 +49,7 @@
     <no-test-jar>false</no-test-jar>
     <useBeta>true</useBeta>
     <gitHubRepo>armadaproject/${artifactId}</gitHubRepo>
-    <java-client.version>0.0.4</java-client.version>
+    <java-client.version>0.0.2</java-client.version>
   </properties>
 
   <dependencyManagement>

diff --git a/src/main/java/io/armadaproject/jenkins/plugin/ArmadaCloud.java b/src/main/java/io/armadaproject/jenkins/plugin/ArmadaCloud.java
@@ -124,6 +124,8 @@ public class ArmadaCloud extends Cloud implements PodTemplateGroup {
     private String armadaQueue;
     private String armadaNamespace;
     private String armadaCredentialsId;
+    private String armadaLookoutUrl;
+    private String armadaLookoutPort;
 
     private String serverUrl;
     private boolean useJenkinsProxy;
@@ -324,6 +326,24 @@ public void setArmadaCredentialsId(String armadaCredentialsId) {
         this.armadaCredentialsId = Util.fixEmpty(armadaCredentialsId);
     }
 
+    public String getArmadaLookoutUrl() {
+        return armadaLookoutUrl;
+    }
+
+    @DataBoundSetter
+    public void setArmadaLookoutUrl(String armadaLookoutUrl) {
+        this.armadaLookoutUrl = armadaLookoutUrl;
+    }
+
+    public String getArmadaLookoutPort() {
+        return armadaLookoutPort;
+    }
+
+    @DataBoundSetter
+    public void setArmadaLookoutPort(String armadaLookoutPort) {
+        this.armadaLookoutPort = armadaLookoutPort;
+    }
+
     public String getServerUrl() {
         return serverUrl;
     }

diff --git a/src/main/java/io/armadaproject/jenkins/plugin/KubernetesLauncher.java b/src/main/java/io/armadaproject/jenkins/plugin/KubernetesLauncher.java
@@ -223,13 +223,14 @@ public synchronized void launch(SlaveComputer computer, TaskListener listener) {
                     }
                     throw e;
                 }
-                LOGGER.log(INFO, () -> "Submitted job: " + kubernetesComputer.getArmadaJobId());
-                listener.getLogger().printf("Submitted job: %s %n",
-                    kubernetesComputer.getArmadaJobId());
+                String armadaLookoutJobUrl = cloud.getArmadaLookoutUrl() + ":"
+                    + cloud.getArmadaLookoutPort() + "/?sb=" + kubernetesComputer.getArmadaJobId();
+                LOGGER.log(INFO, () -> "Submitted job: " + armadaLookoutJobUrl);
+                listener.getLogger().printf("Submitted job: %s %n", armadaLookoutJobUrl);
                 Metrics.metricRegistry().counter(MetricNames.PODS_CREATED).inc();
 
                 node.getRunListener().getLogger().printf("Submitted job: %s %n",
-                    kubernetesComputer.getArmadaJobId());
+                    armadaLookoutJobUrl);
             } else {
                 LOGGER.log(INFO, () -> "Job already exists: " +
                     kubernetesComputer.getArmadaJobId());

diff --git a/src/main/resources/io/armadaproject/jenkins/plugin/ArmadaCloud/config.jelly b/src/main/resources/io/armadaproject/jenkins/plugin/ArmadaCloud/config.jelly
@@ -44,6 +44,14 @@ THE SOFTWARE.
       <c:select/>
     </f:entry>
 
+    <f:entry title="${%Armada Lookout URL}" field="armadaLookoutUrl">
+      <f:textbox default="http://localhost"/>
+    </f:entry>
+
+    <f:entry title="${%Armada Lookout port}" field="armadaLookoutPort">
+      <f:textbox default="30000"/>
+    </f:entry>
+
     <f:validateButton title="${%Test Armada Connection}" progress="${%Testing...}" method="testArmadaConnection" with="armadaUrl,armadaPort,armadaCredentialsId" />
 
     <f:entry title="${%Kubernetes URL}" field="serverUrl">