You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2016/04/11 19:16:49 UTC
[1/3] bigtop git commit: BIGTOP-2378:Do not use archive.apache.org
for ant download
Repository: bigtop
Updated Branches:
refs/heads/master f9e4b93e9 -> 1e23e67d3
BIGTOP-2378:Do not use archive.apache.org for ant download
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/d9ff01c6
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/d9ff01c6
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/d9ff01c6
Branch: refs/heads/master
Commit: d9ff01c644e537767a7f1a72d3cff5741ee819b1
Parents: f9e4b93
Author: Olaf Flebbe <of...@fleb.be>
Authored: Sun Apr 10 19:56:03 2016 +0200
Committer: Olaf Flebbe <of...@fleb.be>
Committed: Mon Apr 11 19:06:40 2016 +0200
----------------------------------------------------------------------
bigtop_toolchain/manifests/ant.pp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/d9ff01c6/bigtop_toolchain/manifests/ant.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/ant.pp b/bigtop_toolchain/manifests/ant.pp
index 1ac754f..ca3fabf 100644
--- a/bigtop_toolchain/manifests/ant.pp
+++ b/bigtop_toolchain/manifests/ant.pp
@@ -16,9 +16,9 @@
class bigtop_toolchain::ant {
$ant = 'apache-ant-1.9.6'
- include bigtop_toolchain::deps
+ $apache_prefix = nearest_apache_mirror()
- exec {"/usr/bin/wget http://archive.apache.org/dist/ant/binaries/$ant-bin.tar.gz":
+ exec {"/usr/bin/wget $apache_prefix/ant/binaries/$ant-bin.tar.gz":
cwd => "/usr/src",
unless => "/usr/bin/test -f /usr/src/$ant-bin.tar.gz",
}
@@ -26,7 +26,7 @@ class bigtop_toolchain::ant {
exec {"/bin/tar xvzf /usr/src/$ant-bin.tar.gz":
cwd => '/usr/local',
creates => "/usr/local/$ant",
- require => Exec["/usr/bin/wget http://archive.apache.org/dist/ant/binaries/$ant-bin.tar.gz"],
+ require => Exec["/usr/bin/wget $apache_prefix/ant/binaries/$ant-bin.tar.gz"],
}
file {'/usr/local/ant':
[3/3] bigtop git commit: BIGTOP-2380: support opensuse-42.1 (leap)
Posted by of...@apache.org.
BIGTOP-2380: support opensuse-42.1 (leap)
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/1e23e67d
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/1e23e67d
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/1e23e67d
Branch: refs/heads/master
Commit: 1e23e67d30409f3a780fa0ac131a8845fb0e8e6a
Parents: d401eda
Author: Olaf Flebbe <of...@fleb.be>
Authored: Sun Apr 10 20:05:46 2016 +0200
Committer: Olaf Flebbe <of...@fleb.be>
Committed: Mon Apr 11 19:13:11 2016 +0200
----------------------------------------------------------------------
bigtop_toolchain/bin/puppetize.sh | 2 +-
bigtop_toolchain/manifests/packages.pp | 5 ++---
docker/bigtop-puppet/opensuse-42.1/Dockerfile | 20 ++++++++++++++++++
docker/bigtop-puppet/opensuse-42.1/build.sh | 16 +++++++++++++++
docker/bigtop-slaves/opensuse-42.1/Dockerfile | 24 ++++++++++++++++++++++
5 files changed, 63 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/1e23e67d/bigtop_toolchain/bin/puppetize.sh
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh
index de02db4..e4c84ea 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -56,7 +56,7 @@ case ${ID}-${VERSION_ID} in
apt-get update
apt-get -y install curl sudo unzip wget puppet
;;
- opensuse-13.2)
+ opensuse-*)
zypper --gpg-auto-import-keys install -y curl sudo unzip wget puppet suse-release ca-certificates-mozilla net-tools tar
;;
centos-6*)
http://git-wip-us.apache.org/repos/asf/bigtop/blob/1e23e67d/bigtop_toolchain/manifests/packages.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index 26959e2..ee6e85b 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -24,10 +24,9 @@ class bigtop_toolchain::packages {
}
$pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "cppunit-devel", "openssl-devel", "python-devel", "python-setuptools", "libxml2-devel", "libxslt-devel", "cyrus-sasl-devel", "sqlite-devel", "openldap-devel", $mysql_devel, "rpm-build", "redhat-rpm-config", "fuse-libs", "asciidoc", "xmlto", "libyaml-devel", "gmp-devel", "snappy-devel", "boost-devel", "xfsprogs-devel", "libuuid-devel" ]
}
- /(?i:(SLES|opensuse))/: { $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "cppunit-devel", "libopenssl-devel", "rpm-devel", "rpm-build", "pkg-config", "gmp-devel", "python-devel", "python-setuptools", "libxml2-devel", "libxslt-devel", "cyrus-sasl-devel", "sqlite3-devel", "openldap2-devel", "libyaml-devel", "krb5-devel", "asciidoc", "xmlto", "libmysqlclient-devel", "snappy-devel", "boost-devel", "xfsprogs-devel", "libuuid-devel" ]
+ /(?i:(SLES|opensuse))/: { $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "cppunit-devel", "rpm-devel", "rpm-build", "pkg-config", "gmp-devel", "python-devel", "python-setuptools", "libxml2-devel", "libxslt-devel", "cyrus-sasl-devel", "sqlite3-devel", "openldap2-devel", "libyaml-devel", "krb5-devel", "asciidoc", "xmlto", "libmysqlclient-devel", "snappy-devel", "boost-devel", "xfsprogs-devel", "libuuid-devel" ]
# fix package dependencies: BIGTOP-2120 and BIGTOP-2152
- exec { '/usr/bin/zypper remove -y krb5-mini':
- } -> exec {'/usr/bin/zypper install -y libopenssl-devel':
+ exec { '/usr/bin/zypper -q -n install --force-resolution krb5':
} -> Package <| |>
}
Amazon: { $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "openssl-devel", "rpm-build", "system-rpm-config", "fuse-libs","gmp-devel", "snappy-devel" ] }
http://git-wip-us.apache.org/repos/asf/bigtop/blob/1e23e67d/docker/bigtop-puppet/opensuse-42.1/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-puppet/opensuse-42.1/Dockerfile b/docker/bigtop-puppet/opensuse-42.1/Dockerfile
new file mode 100644
index 0000000..5ac67b5
--- /dev/null
+++ b/docker/bigtop-puppet/opensuse-42.1/Dockerfile
@@ -0,0 +1,20 @@
+# 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.
+FROM opensuse:42.1
+MAINTAINER dev@bigtop.apache.org
+
+COPY puppetize.sh /tmp/puppetize.sh
+
+RUN bash /tmp/puppetize.sh
http://git-wip-us.apache.org/repos/asf/bigtop/blob/1e23e67d/docker/bigtop-puppet/opensuse-42.1/build.sh
----------------------------------------------------------------------
diff --git a/docker/bigtop-puppet/opensuse-42.1/build.sh b/docker/bigtop-puppet/opensuse-42.1/build.sh
new file mode 100755
index 0000000..620fa43
--- /dev/null
+++ b/docker/bigtop-puppet/opensuse-42.1/build.sh
@@ -0,0 +1,16 @@
+# 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.
+cp ../../../bigtop_toolchain/bin/puppetize.sh .
+docker build -t bigtop/puppet:opensuse-42.1 .
http://git-wip-us.apache.org/repos/asf/bigtop/blob/1e23e67d/docker/bigtop-slaves/opensuse-42.1/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/opensuse-42.1/Dockerfile b/docker/bigtop-slaves/opensuse-42.1/Dockerfile
new file mode 100644
index 0000000..d711c8a
--- /dev/null
+++ b/docker/bigtop-slaves/opensuse-42.1/Dockerfile
@@ -0,0 +1,24 @@
+# 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.
+FROM bigtop/puppet:opensuse-42.1
+MAINTAINER dev@bigtop.apache.org
+
+COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
+COPY gradle.home /usr/share/gradle.home
+
+RUN puppet apply -e "include bigtop_toolchain::installer"
+RUN chown jenkins:jenkins /usr/share/gradle.home
+
+ENV GRADLE_USER_HOME=/usr/share/gradle.home
[2/3] bigtop git commit: BIGTOP-2379: update maven to 3.3.9 and
refactor toolchain
Posted by of...@apache.org.
BIGTOP-2379: update maven to 3.3.9 and refactor toolchain
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/d401eda8
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/d401eda8
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/d401eda8
Branch: refs/heads/master
Commit: d401eda870a2abfed2b897ed488ee2a571678e68
Parents: d9ff01c
Author: Olaf Flebbe <of...@fleb.be>
Authored: Sun Apr 10 19:58:11 2016 +0200
Committer: Olaf Flebbe <of...@fleb.be>
Committed: Mon Apr 11 19:12:27 2016 +0200
----------------------------------------------------------------------
bigtop_toolchain/manifests/deps.pp | 27 ---------------------------
bigtop_toolchain/manifests/gradle.pp | 3 ---
bigtop_toolchain/manifests/maven.pp | 19 +++++++++++++------
bigtop_toolchain/manifests/protobuf.pp | 2 --
4 files changed, 13 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/d401eda8/bigtop_toolchain/manifests/deps.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/deps.pp b/bigtop_toolchain/manifests/deps.pp
deleted file mode 100644
index d265708..0000000
--- a/bigtop_toolchain/manifests/deps.pp
+++ /dev/null
@@ -1,27 +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::deps {
-
- $apache_prefix = nearest_apache_mirror()
- include bigtop_toolchain::packages
-
- exec {"/usr/bin/wget $apache_prefix/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.tar.gz":
- cwd => "/usr/src",
- require => Package[$packages::pkgs],
- unless => "/usr/bin/test -f /usr/src/apache-maven-3.3.3-bin.tar.gz",
- }
-}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/d401eda8/bigtop_toolchain/manifests/gradle.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/gradle.pp b/bigtop_toolchain/manifests/gradle.pp
index 70be36e..aa4247a 100644
--- a/bigtop_toolchain/manifests/gradle.pp
+++ b/bigtop_toolchain/manifests/gradle.pp
@@ -15,11 +15,8 @@
class bigtop_toolchain::gradle {
- include bigtop_toolchain::deps
-
exec {"/usr/bin/wget http://services.gradle.org/distributions/gradle-2.7-bin.zip":
cwd => "/usr/src",
- require => Package[$packages::pkgs],
unless => "/usr/bin/test -f /usr/src/gradle-2.7-bin.zip",
}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/d401eda8/bigtop_toolchain/manifests/maven.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/maven.pp b/bigtop_toolchain/manifests/maven.pp
index 352c1be..dbdcbd0 100644
--- a/bigtop_toolchain/manifests/maven.pp
+++ b/bigtop_toolchain/manifests/maven.pp
@@ -14,18 +14,25 @@
# limitations under the License.
class bigtop_toolchain::maven {
+ $mvnversion = '3.3.9'
+ $mvn = "apache-maven-$mvnversion"
- include bigtop_toolchain::deps
- exec {'/bin/tar xvzf /usr/src/apache-maven-3.3.3-bin.tar.gz':
+ $apache_prefix = nearest_apache_mirror()
+
+ exec {"/usr/bin/wget $apache_prefix/maven/maven-3/$mvnversion/binaries/$mvn-bin.tar.gz":
+ cwd => "/usr/src",
+ unless => "/usr/bin/test -f /usr/src/$mvn-bin.tar.gz",
+ }
+
+ exec {"/bin/tar xvzf /usr/src/$mvn-bin.tar.gz":
cwd => '/usr/local',
refreshonly => true,
- subscribe => Exec["/usr/bin/wget $bigtop_toolchain::deps::apache_prefix/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.tar.gz"],
- require => Exec["/usr/bin/wget $bigtop_toolchain::deps::apache_prefix/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.tar.gz"],
+ require => Exec["/usr/bin/wget $apache_prefix/maven/maven-3/$mvnversion/binaries/$mvn-bin.tar.gz"],
}
file {'/usr/local/maven':
ensure => link,
- target => '/usr/local/apache-maven-3.3.3',
- require => Exec['/bin/tar xvzf /usr/src/apache-maven-3.3.3-bin.tar.gz'],
+ target => "/usr/local/apache-maven-$mvnversion",
+ require => Exec["/bin/tar xvzf /usr/src/$mvn-bin.tar.gz"],
}
}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/d401eda8/bigtop_toolchain/manifests/protobuf.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/protobuf.pp b/bigtop_toolchain/manifests/protobuf.pp
index c71dec2..06c575a 100644
--- a/bigtop_toolchain/manifests/protobuf.pp
+++ b/bigtop_toolchain/manifests/protobuf.pp
@@ -15,8 +15,6 @@
class bigtop_toolchain::protobuf {
- include bigtop_toolchain::deps
-
case $operatingsystem{
/Ubuntu|Debian/: {
case $architecture {