Restore Jenkinsfile/test pom

Author: janfaracik

Jenkinsfile

@@ -216,40 +216,40 @@ axes.values().combinations {
   }
 }
 
-// def athAxes = [
-//   platforms: ['linux'],
-//   jdks: [21],
-//   browsers: ['firefox'],
-// ]
-// athAxes.values().combinations {
-//   def (platform, jdk, browser) = it
-//   builds["ath-${platform}-jdk${jdk}-${browser}"] = {
-//     retry(conditions: [agent(), nonresumable()], count: 2) {
-//       node('docker-highmem') {
-//         // Just to be safe
-//         deleteDir()
-//         checkout scm
-//
-//         withChecks(name: 'Tests', includeStage: true) {
-//           infra.withArtifactCachingProxy {
-//             sh "bash ath.sh ${jdk} ${browser}"
-//           }
-//           junit testResults: 'target/ath-reports/TEST-*.xml', testDataPublishers: [[$class: 'AttachmentPublisher']]
-//         }
-//         /*
-//          * Currently disabled, as the fact that this is a manually created subset will confuse Launchable,
-//          * which expects this to be a full build. When we implement subsetting, this can be re-enabled using
-//          * Launchable's subset rather than our own.
-//          */
-//         /*
-//          withCredentials([string(credentialsId: 'launchable-jenkins-acceptance-test-harness', variable: 'LAUNCHABLE_TOKEN')]) {
-//          sh "launchable verify && launchable record tests --no-build --flavor platform=${platform} --flavor jdk=${jdk} --flavor browser=${browser} maven './target/ath-reports'"
-//          }
-//          */
-//       }
-//     }
-//   }
-// }
+def athAxes = [
+  platforms: ['linux'],
+  jdks: [21],
+  browsers: ['firefox'],
+]
+athAxes.values().combinations {
+  def (platform, jdk, browser) = it
+  builds["ath-${platform}-jdk${jdk}-${browser}"] = {
+    retry(conditions: [agent(), nonresumable()], count: 2) {
+      node('docker-highmem') {
+        // Just to be safe
+        deleteDir()
+        checkout scm
+
+        withChecks(name: 'Tests', includeStage: true) {
+          infra.withArtifactCachingProxy {
+            sh "bash ath.sh ${jdk} ${browser}"
+          }
+          junit testResults: 'target/ath-reports/TEST-*.xml', testDataPublishers: [[$class: 'AttachmentPublisher']]
+        }
+        /*
+         * Currently disabled, as the fact that this is a manually created subset will confuse Launchable,
+         * which expects this to be a full build. When we implement subsetting, this can be re-enabled using
+         * Launchable's subset rather than our own.
+         */
+        /*
+         withCredentials([string(credentialsId: 'launchable-jenkins-acceptance-test-harness', variable: 'LAUNCHABLE_TOKEN')]) {
+         sh "launchable verify && launchable record tests --no-build --flavor platform=${platform} --flavor jdk=${jdk} --flavor browser=${browser} maven './target/ath-reports'"
+         }
+         */
+      }
+    }
+  }
+}
 
 builds.failFast = failFast
 parallel builds

test/pom.xml

@@ -52,8 +52,6 @@ THE SOFTWARE.
 
     <!-- Filled in by maven-hpi-plugin with "-javaagent:/path/to/mockito-core-<version>.jar" -->
     <jenkins.javaAgent />
-    <!--    TODO - remove the below-->
-    <test>hudson.AboutJenkinsTest</test>
   </properties>
 
   <dependencyManagement>