This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new d105d6f BIGTOP-3551: Phantomjs caused Ambari build failure on non-x86
(#784)
d105d6f is described below
commit d105d6fa624bd3070bd4d6633c0b2e68f812a7b3
Author: Jun He <[email protected]>
AuthorDate: Mon Jun 14 08:43:30 2021 +0800
BIGTOP-3551: Phantomjs caused Ambari build failure on non-x86 (#784)
After ambari is bumped to 2.7.5, it cannot build on non-x86
platforms as phantomjs prebuilt is required.
This patch disables phantomjs reference as it is only used
for testing.
Change-Id: Ie23eae41441b201b31d6ed652ac203211b9482a7
Signed-off-by: Jun He <[email protected]>
---
.../src/common/ambari/patch2-AMBARI-phantomjs.diff | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/bigtop-packages/src/common/ambari/patch2-AMBARI-phantomjs.diff
b/bigtop-packages/src/common/ambari/patch2-AMBARI-phantomjs.diff
index 372fda1..268fff7 100644
--- a/bigtop-packages/src/common/ambari/patch2-AMBARI-phantomjs.diff
+++ b/bigtop-packages/src/common/ambari/patch2-AMBARI-phantomjs.diff
@@ -11,6 +11,18 @@ index 24cb68af32..2b4009d5f7 100644
"protractor": "1.0.0"
},
"scripts": {
+diff --git a/ambari-logsearch/ambari-logsearch-web/package.json
b/ambari-logsearch/ambari-logsearch-web/package.json
+index fb09f00e78..1974eaa07e 100644
+--- a/ambari-logsearch/ambari-logsearch-web/package.json
++++ b/ambari-logsearch/ambari-logsearch-web/package.json
+@@ -72,7 +72,6 @@
+ "karma-coverage-istanbul-reporter": "^0.2.0",
+ "karma-jasmine": "~1.1.0",
+ "karma-jasmine-html-reporter": "^0.2.2",
+- "karma-phantomjs-launcher": "^1.0.4",
+ "less-loader": "^4.0.5",
+ "postcss-loader": "^1.3.3",
+ "postcss-url": "^5.1.2",
diff --git a/ambari-web/package.json b/ambari-web/package.json
index 785925e80b..9cc8d76666 100644
--- a/ambari-web/package.json
