You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by iw...@apache.org on 2020/04/23 11:30:51 UTC
[bigtop] branch master updated: BIGTOP-3337. Remove Node.js from
the toolchain. (#626)
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 2fedbd6 BIGTOP-3337. Remove Node.js from the toolchain. (#626)
2fedbd6 is described below
commit 2fedbd625a351248a5e78a81c777ebf62c827ff4
Author: Kengo Seki <se...@apache.org>
AuthorDate: Thu Apr 23 20:30:43 2020 +0900
BIGTOP-3337. Remove Node.js from the toolchain. (#626)
---
bigtop_toolchain/manifests/installer.pp | 1 -
bigtop_toolchain/manifests/node.pp | 47 ---------------------------------
bigtop_toolchain/templates/jenkins.sh | 3 +--
3 files changed, 1 insertion(+), 50 deletions(-)
diff --git a/bigtop_toolchain/manifests/installer.pp b/bigtop_toolchain/manifests/installer.pp
index 813d203..8a09490 100644
--- a/bigtop_toolchain/manifests/installer.pp
+++ b/bigtop_toolchain/manifests/installer.pp
@@ -18,7 +18,6 @@ class bigtop_toolchain::installer {
include bigtop_toolchain::maven
include bigtop_toolchain::ant
include bigtop_toolchain::gradle
- include bigtop_toolchain::node
include bigtop_toolchain::protobuf
include bigtop_toolchain::packages
include bigtop_toolchain::env
diff --git a/bigtop_toolchain/manifests/node.pp b/bigtop_toolchain/manifests/node.pp
deleted file mode 100644
index 6b204f1..0000000
--- a/bigtop_toolchain/manifests/node.pp
+++ /dev/null
@@ -1,47 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-class bigtop_toolchain::node {
- case $architecture {
- /amd64|x86_64/ : { $node_version = "0.10.44"
- $arch = "x64" }
- 'ppc64le' : { $node_version = "4.4.7"
- $arch = "ppc64le" }
- 'aarch64' : { $node_version = "4.4.7"
- $arch = "arm64" }
- }
- $brunch_version = "1.7.20"
- $node_name = "node-v${node_version}-linux-$arch"
- $node_dl_url = 'https://nodejs.org/dist/v$node_version/'
-
- exec { "get node":
- command => "/usr/bin/wget -O - https://nodejs.org/dist/v${node_version}/${node_name}.tar.gz | /bin/tar xzf -",
- cwd => "/usr/local",
- unless => "/usr/bin/test -x /usr/local/${node_name}/bin/npm",
- }
-
- file { "/usr/local/node":
- ensure => link,
- target => "/usr/local/${node_name}",
- require => Exec["get node"],
- }
-
- exec { "install brunch":
- command => "/usr/local/node/bin/npm install -g brunch@${brunch_version}",
- cwd => "/usr/local",
- creates => "/usr/local/node/bin/brunch",
- require => File["/usr/local/node"],
- }
-}
diff --git a/bigtop_toolchain/templates/jenkins.sh b/bigtop_toolchain/templates/jenkins.sh
index 7492742..31e3ecd 100644
--- a/bigtop_toolchain/templates/jenkins.sh
+++ b/bigtop_toolchain/templates/jenkins.sh
@@ -17,7 +17,6 @@ export MAVEN_HOME=/usr/local/maven
export JAVA_HOME=<%= @javahome %>
export ANT_HOME=/usr/local/ant
export GRADLE_HOME=/usr/local/gradle
-export NODE_HOME=/usr/local/node
-export PATH=$MAVEN_HOME/bin:$ANT_HOME/bin:$GRADLE_HOME/bin:$NODE_HOME/bin:$PATH
+export PATH=$MAVEN_HOME/bin:$ANT_HOME/bin:$GRADLE_HOME/bin:$PATH
export GRADLE_OPTS="-Dorg.gradle.daemon=true"