Merge pull request #30 from timja/JENKINS-69966-new-weather-broken

JENKINS-69966 Fix plugin on 2.375
jenkinsci · Nov 5, 2022 · e3d8435 · e3d8435
2 parents d623611 + c4b29eb
commit e3d8435
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-/.*
 *.iml
 
 /work

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -0,0 +1,7 @@
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+  <extension>
+    <groupId>io.jenkins.tools.incrementals</groupId>
+    <artifactId>git-changelist-maven-extension</artifactId>
+    <version>1.4</version>
+  </extension>
+</extensions>
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -0,0 +1,2 @@
+-Pconsume-incrementals
+-Pmight-produce-incrementals
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   </parent>
 
   <artifactId>cloud-stats</artifactId>
-  <version>0.28-SNAPSHOT</version>
+  <version>${revision}${changelist}</version>
   <packaging>hpi</packaging>
   <name>Cloud Statistics Plugin</name>
   <description>Report Jenkins dynamic provisioning activities and statistics</description>
@@ -29,10 +29,10 @@
   </licenses>
 
   <scm>
-    <connection>scm:git:git://github.com/jenkinsci/cloud-stats-plugin.git</connection>
-    <developerConnection>scm:git:git@github.com:jenkinsci/cloud-stats-plugin.git</developerConnection>
-    <url>https://github.com/jenkinsci/cloud-stats-plugin</url>
-    <tag>HEAD</tag>
+    <connection>scm:git:git://github.com/${gitHubRepo}.git</connection>
+    <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
+    <url>https://github.com/${gitHubRepo}</url>
+    <tag>${scmTag}</tag>
   </scm>
 
   <dependencies>
@@ -42,6 +42,19 @@
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <version>4.2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <!-- JTH ships a newer version -->
+        <exclusion>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
 
   <repositories>
@@ -59,6 +72,9 @@
   </pluginRepositories>
 
   <properties>
+    <revision>0.28</revision>
+    <changelist>-SNAPSHOT</changelist>
+    <gitHubRepo>jenkinsci/cloud-stats-plugin</gitHubRepo>
     <jenkins.version>2.235.1</jenkins.version>
     <java.level>8</java.level>
     <surefire.useFile>false</surefire.useFile>

diff --git a/src/main/resources/org/jenkinsci/plugins/cloudstats/CloudAction/summary.groovy b/src/main/resources/org/jenkinsci/plugins/cloudstats/CloudAction/summary.groovy
@@ -18,7 +18,7 @@ Health.Report report = index.cloudHealth(action.cloud.name).current
 HealthReport hr = report.weather
 
 h2 {
-    l.icon("class": "${hr.iconClassName} icon-md", alt: hr.score)
+    l.icon("class": "${hr.iconClassName} icon-md", alt: hr.score + "")
     st.nbsp()
     text("${action.displayName} (Health ${report})")
 }

diff --git a/src/main/resources/org/jenkinsci/plugins/cloudstats/CloudStatistics/index.groovy b/src/main/resources/org/jenkinsci/plugins/cloudstats/CloudStatistics/index.groovy
@@ -56,13 +56,13 @@ l.layout(permission: stats.getRequiredPermission()) {
                     td()
                     td {
                         def score = ch.overall
-                        l.icon("class": "${score.weather.iconClassName} icon-sm", alt: score.weather.score)
+                        l.icon("class": "${score.weather.iconClassName} icon-sm", alt: score.weather.score + "")
                         st.nbsp()
                         text(score)
                     }
                     td {
                         def score = ch.current
-                        l.icon("class": "${score.weather.iconClassName} icon-sm", alt: score.weather.score)
+                        l.icon("class": "${score.weather.iconClassName} icon-sm", alt: score.weather.score + "")
                         st.nbsp()
                         text(score)
                     }
@@ -76,13 +76,13 @@ l.layout(permission: stats.getRequiredPermission()) {
                             td(template)
                             td {
                                 def score = th.overall
-                                l.icon("class": "${score.weather.iconClassName} icon-sm", alt: score.weather.score)
+                                l.icon("class": "${score.weather.iconClassName} icon-sm", alt: score.weather.score + "")
                                 st.nbsp()
                                 text(score)
                             }
                             td {
                                 def score = th.current
-                                l.icon("class": "${score.weather.iconClassName} icon-sm", alt: score.weather.score)
+                                l.icon("class": "${score.weather.iconClassName} icon-sm", alt: score.weather.score + "")
                                 st.nbsp()
                                 text(score)
                             }

diff --git a/src/main/resources/org/jenkinsci/plugins/cloudstats/StatsWidget/index.groovy b/src/main/resources/org/jenkinsci/plugins/cloudstats/StatsWidget/index.groovy
@@ -50,7 +50,7 @@ if (widget.displayed) {
             tr {
                 def score = index.cloudHealth(cloudName).getCurrent()
                 td(colspan: 2) {
-                    l.icon("class": "${score.weather.iconClassName} icon-sm", alt: score.weather.score)
+                    l.icon("class": "${score.weather.iconClassName} icon-sm", alt: score.weather.score + "")
                     st.nbsp()
                     if (cloudViews && j.getCloud(cloudName) != null) {
                         a(href: rootURL + "/cloud/" + cloudName) {
@@ -68,7 +68,7 @@ if (widget.displayed) {
                     tr {
                         td()
                         td {
-                            l.icon("class": "${health.current.weather.iconClassName} icon-sm", alt: health.current.weather.score)
+                            l.icon("class": "${health.current.weather.iconClassName} icon-sm", alt: health.current.weather.score + "")
                             st.nbsp()
                             text(templateName)
                         }

diff --git a/src/test/java/org/jenkinsci/plugins/cloudstats/CloudStatisticsTest.java b/src/test/java/org/jenkinsci/plugins/cloudstats/CloudStatisticsTest.java
@@ -31,12 +31,7 @@
 import hudson.BulkChange;
 import hudson.ExtensionList;
 import hudson.Functions;
-import hudson.model.Computer;
-import hudson.model.FreeStyleBuild;
-import hudson.model.FreeStyleProject;
-import hudson.model.Label;
-import hudson.model.LoadStatistics;
-import hudson.model.Node;
+import hudson.model.*;
 import hudson.model.queue.QueueTaskFuture;
 import hudson.security.AuthorizationStrategy;
 import hudson.slaves.NodeProvisioner;
@@ -56,12 +51,16 @@
 import javax.annotation.Nonnull;
 import java.io.ObjectStreamException;
 import java.net.URL;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.awaitility.Awaitility.await;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsString;
@@ -229,13 +228,13 @@ public void ui() throws Exception {
 
         Id okId = new Id("MyCloud", "working-template", "future-agent");
         provisioningListener.onStarted(okId);
-        slave = TrackedAgent.create(okId, j);
-        provisioningListener.onComplete(okId, slave);
-        slave.toComputer().waitUntilOnline();
-        Thread.sleep(500);
-        slave.toComputer().doDoDelete();
+        final Node agent = TrackedAgent.create(okId, j);
+        provisioningListener.onComplete(okId, agent);
+        agent.toComputer().waitUntilOnline();
+        Thread.sleep(1000L);
+        agent.toComputer().doDoDelete();
 
-        Thread.sleep(500);
+        await().atMost(10, SECONDS).until(() -> j.jenkins.getNode(agent.getNodeName()) == null);
 
         // Then
         ProvisioningActivity failedToProvision = cs.getActivityFor(failId);