From 5dcb71d8fb15a93ea39128a1044838d893d4cc4a Mon Sep 17 00:00:00 2001
From: Ferenc Erdelyi <ferdelyi@cloudera.com>
Date: Tue, 21 Jul 2026 11:41:23 +0200
Subject: [PATCH 1/2] YARN-11969. Make catalog-webapp jasmine browser tests
 skippable independently of -DskipTests

The hadoop-yarn-applications-catalog-webapp module runs a jasmine-maven-plugin
test that drives a PhantomJS browser. In headless build environments PhantomJS
cannot start and the plugin fails with UnreachableBrowserException. Because this
is a plugin-execution failure rather than a Surefire test failure,
-Dmaven.test.failure.ignore=true does not suppress it and it fails the build.
The jasmine config previously hardcoded its skip flag to ${skipTests}, so the
only escape hatch was -DskipTests, which skips every test in the module.

Introduce a skipJasmineTests property defaulting to ${skipTests} and bind the
plugin's <skipJasmineTests> to it. Default behavior is unchanged; a headless
build can pass -DskipJasmineTests=true to skip only the browser-driven tests
while still compiling and covering the rest of the module. Build-config change
only; no production code affected.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../hadoop-yarn-applications-catalog-webapp/pom.xml       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
index 9c93c9553def72..4844ffa27abdcb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
@@ -37,6 +37,12 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <dependency.locations.enabled>false</dependency.locations.enabled>
         <javascript.test>*Spec</javascript.test>
+        <!-- Skip the browser-driven jasmine tests independently of -DskipTests.
+             Defaults to ${skipTests} so normal builds are unchanged; a headless CI
+             run (no PhantomJS browser available) can pass -DskipJasmineTests=true to
+             avoid the hard build failure while still compiling and covering the
+             module's Java/JS. -->
+        <skipJasmineTests>${skipTests}</skipJasmineTests>
     </properties>
 
   <dependencies>
@@ -484,7 +490,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <skipJasmineTests>${skipTests}</skipJasmineTests>
+                    <skipJasmineTests>${skipJasmineTests}</skipJasmineTests>
                     <webDriverClassName>org.openqa.selenium.phantomjs.PhantomJSDriver</webDriverClassName>
                     <webDriverCapabilities>
                         <capability>

From f5de82a13fab51085422b01eed6c0c91a834cad3 Mon Sep 17 00:00:00 2001
From: Ferenc Erdelyi <ferdelyi@cloudera.com>
Date: Tue, 28 Jul 2026 18:00:32 +0200
Subject: [PATCH 2/2] YARN-11969. Remove hardcoded skipJasmineTests element so
 -DskipJasmineTests takes effect

Follow-up to the previous commit. Verifying that change with a real build
(mvn test -DskipJasmineTests=true) showed the jasmine specs still ran, i.e.
the new flag had no effect.

Root cause: the jasmine-maven-plugin (2.1) already declares
skipJasmineTests as @Parameter(property="skipJasmineTests") and skips when
skipTests, maven.test.skip or skipJasmineTests is true (isSkipTests() ORs
the three). Providing an explicit <skipJasmineTests> element in the plugin
<configuration> overrides that native property binding, and the same-named
project property added in the previous commit shadowed the
-DskipJasmineTests user property during interpolation, so the plugin never
saw the flag. (mvn help:evaluate resolved the property to true, which was a
misleading positive: it uses different precedence than plugin-config
interpolation.)

Fix: drop the explicit <skipJasmineTests> element and the added property
entirely, and let the plugin's own bindings apply. -DskipTests continues to
skip jasmine via isSkipTests(), while -DskipJasmineTests=true now skips only
the browser-driven specs and leaves the module's other tests running.

Verified with mvn test on the module:
- -DskipJasmineTests=true  -> "Skipping Jasmine Specs", build succeeds, surefire runs
- -DskipTests              -> "Skipping Jasmine Specs", build succeeds
- (no flag)                -> "Executing Jasmine Specs", build succeeds

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../pom.xml                                       | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
index 4844ffa27abdcb..9660b6a61471f8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
@@ -37,12 +37,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <dependency.locations.enabled>false</dependency.locations.enabled>
         <javascript.test>*Spec</javascript.test>
-        <!-- Skip the browser-driven jasmine tests independently of -DskipTests.
-             Defaults to ${skipTests} so normal builds are unchanged; a headless CI
-             run (no PhantomJS browser available) can pass -DskipJasmineTests=true to
-             avoid the hard build failure while still compiling and covering the
-             module's Java/JS. -->
-        <skipJasmineTests>${skipTests}</skipJasmineTests>
     </properties>
 
   <dependencies>
@@ -490,7 +484,14 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <skipJasmineTests>${skipJasmineTests}</skipJasmineTests>
+                    <!-- No explicit skipJasmineTests element: the plugin already
+                         binds skipTests, maven.test.skip and skipJasmineTests to the
+                         matching command-line properties and skips when any is true.
+                         Setting the element here would override those bindings, so
+                         -DskipJasmineTests would be ignored. Omitting it lets
+                         -DskipTests skip jasmine (as before) while -DskipJasmineTests=true
+                         skips only the browser-driven specs (e.g. on a headless box
+                         with no PhantomJS) without disabling the module's other tests. -->
                     <webDriverClassName>org.openqa.selenium.phantomjs.PhantomJSDriver</webDriverClassName>
                     <webDriverCapabilities>
                         <capability>