From d9e9e5657d5855d7531983ee1c99998b2e521837 Mon Sep 17 00:00:00 2001
From: Billie Rinaldi <billie@apache.org>
Date: Fri, 29 Mar 2019 07:48:55 -0700
Subject: [PATCH] YARN-9348. Application catalog build system bug fixes.
 Contributed by Eric Yang

---
 .../.gitignore                                |  2 +
 .../package.json                              | 16 +-----
 .../pom.xml                                   | 50 ++++++++++++++++---
 3 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.gitignore b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.gitignore
index a82f9459202..2d8667ea022 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.gitignore
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.gitignore
@@ -1,3 +1,5 @@
 .classpath
 .project
 /target/
+/node_modules/
+yarn.lock
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
index e8781e0044f..f09442cfc4e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
@@ -15,26 +15,12 @@
         "roboto-fontface": "0.10.0"
     },
     "devDependencies": {
-        "http-server": "^0.6.1",
         "requirejs": "^2.1.0",
-        "karma": "4.0.0",
-        "karma-requirejs": "^0.2.2",
-        "karma-script-launcher": "^0.1.0",
-        "karma-chrome-launcher": "^0.1.4",
-        "karma-firefox-launcher": "^0.1.3",
-        "karma-jasmine": "^0.1.5",
-        "karma-junit-reporter": "^0.2.2",
         "shelljs": "^0.2.6",
         "apidoc": "0.17.7"
     },
     "scripts": {
         "prestart": "npm install & mvn clean package",
-        "start": "http-server target/app -a localhost -p 8000",
-        "pretest": "npm install",
-        "test": "karma start src/test/javascript/karma.conf.js",
-        "test-single-run": "karma start src/test/javascript/karma.conf.js  --single-run",
-        "preupdate-webdriver": "npm install",
-        "update-webdriver": "webdriver-manager update",
-        "update-index-async": "node -e \"require('shelljs/global'); sed('-i', /\\/\\/@@NG_LOADER_START@@[\\s\\S]*\\/\\/@@NG_LOADER_END@@/, '//@@NG_LOADER_START@@\\n' + cat('src/main/webapp/vendor/angular-loader/angular-loader.min.js') + '\\n//@@NG_LOADER_END@@', 'src/main/webapp/index.html');\""
+        "pretest": "npm install"
     }
 }
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 8e0cae7b345..35beb5cfeac 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
@@ -229,6 +229,9 @@
             <plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
+                <configuration>
+                    <workingDirectory>target</workingDirectory>
+                </configuration>
                 <executions>
                     <execution>
                         <id>install node and yarn</id>
@@ -416,15 +419,49 @@
         </plugins>
     </build>
 
-<!--
     <profiles>
+      <profile>
+        <id>parallel-tests</id>
+        <build>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.hadoop</groupId>
+              <artifactId>hadoop-maven-plugins</artifactId>
+              <executions>
+                <execution>
+                  <id>parallel-tests-createdir</id>
+                  <goals>
+                    <goal>parallel-tests-createdir</goal>
+                  </goals>
+                </execution>
+              </executions>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <configuration>
+                <forkCount>${testsThreadCount}</forkCount>
+                <reuseForks>false</reuseForks>
+                <argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine>
+                <systemPropertyVariables>
+                  <testsThreadCount>${testsThreadCount}</testsThreadCount>
+                  <test.build.data>${test.build.data}/${surefire.forkNumber}</test.build.data>
+                  <test.build.dir>${test.build.dir}/${surefire.forkNumber}</test.build.dir>
+                  <hadoop.tmp.dir>${hadoop.tmp.dir}/${surefire.forkNumber}</hadoop.tmp.dir>
+
+                  <!-- Due to a Maven quirk, setting this to just -->
+                  <!-- surefire.forkNumber won't do the parameter substitution. -->
+                  <!-- Putting a prefix in front of it like "fork-" makes it -->
+                  <!-- work. -->
+                  <test.unique.fork.id>fork-${surefire.forkNumber}</test.unique.fork.id>
+                </systemPropertyVariables>
+              </configuration>
+            </plugin>
+          </plugins>
+        </build>
+      </profile>
       <profile>
         <id>rest-docs</id>
-        <activation>
-          <file>
-            <exists>${basedir}/node_modules/.bin/apidoc</exists>
-          </file>
-        </activation>
         <build>
           <plugins>
             <plugin>
@@ -450,6 +487,5 @@
         </build>
       </profile>
     </profiles>
--->
 
 </project>