YARN-6336. Jenkins report YARN new UI build failure. Contributed by Sunil G.
(cherry picked from commit bb6a214cd34b9c87b0ba68205c680024ad294587) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/edad8a3c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/edad8a3c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/edad8a3c Branch: refs/heads/branch-3.0.0-alpha3 Commit: edad8a3c76bb26ab0e335540cd510092c0bb9f20 Parents: 7a51949 Author: Rohith Sharma K S <rohithsharm...@apache.org> Authored: Wed Mar 15 15:53:57 2017 +0530 Committer: Andrew Wang <w...@apache.org> Committed: Tue May 23 15:35:00 2017 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml | 13 ++++++------- .../hadoop-yarn-ui/src/main/webapp/package.json | 6 ++++-- 2 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/edad8a3c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml index 1eb9b65..e221e7e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml @@ -31,7 +31,7 @@ <properties> <packaging.type>pom</packaging.type> <webappTgtDir>${basedir}/target/src/main/webapp</webappTgtDir> - <node.executable>node</node.executable> + <node.executable>${basedir}/target/src/main/webapp/node/node</node.executable> <nodeVersion>v4.4.5</nodeVersion> <npmVersion>2.15.5</npmVersion> <keep-ui-build-cache>false</keep-ui-build-cache> @@ -169,12 +169,11 @@ </goals> <configuration> <workingDirectory>${webappTgtDir}</workingDirectory> - <executable>ember</executable> + <executable>${node.executable}</executable> <arguments> - <argument>build</argument> - <argument>-prod</argument> - <argument>--output-path</argument> - <argument>${basedir}/target/dist</argument> + <argument>node/npm/bin/npm-cli</argument> + <argument>run</argument> + <argument>build:mvn</argument> </arguments> </configuration> </execution> @@ -187,7 +186,7 @@ <artifactId>maven-war-plugin</artifactId> <configuration> <webXml>${basedir}/src/main/webapp/WEB-INF/web.xml</webXml> - <warSourceDirectory>${basedir}/target/dist</warSourceDirectory> + <warSourceDirectory>${webappTgtDir}/dist</warSourceDirectory> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/hadoop/blob/edad8a3c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json index 573e505..105dad3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json @@ -8,8 +8,10 @@ "test": "tests" }, "scripts": { - "build": "ember build", - "start": "ember server" + "build": "TMPDIR=tmp node ./node_modules/ember-cli/bin/ember build", + "start": "TMPDIR=tmp node ./node_modules/ember-cli/bin/ember server", + + "build:mvn": "TMPDIR=tmp node/node ./node_modules/ember-cli/bin/ember build -prod" }, "repository": "", "engines": { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
