From 1d64e3551016d0b074c3d9a2f528447324c04b11 Mon Sep 17 00:00:00 2001 From: Epikhin Mikhail Date: Mon, 16 Jul 2018 12:21:59 +0300 Subject: [PATCH 1/2] Add support ubuntu 18.04 --- bigtop_toolchain/bin/puppetize.sh | 2 +- build.gradle | 4 ++-- docker/bigtop-slaves/Dockerfile.template | 2 +- docker/sandbox/sandbox-env.sh | 1 + provisioner/docker/config_ubuntu-18.04.yaml | 24 +++++++++++++++++++++ 5 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 provisioner/docker/config_ubuntu-18.04.yaml diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh index b438f44a21..39f0e3a2f7 100755 --- a/bigtop_toolchain/bin/puppetize.sh +++ b/bigtop_toolchain/bin/puppetize.sh @@ -26,7 +26,7 @@ case ${ID}-${VERSION_ID} in dnf -y check-update dnf -y install hostname findutils curl sudo unzip wget puppet puppetlabs-stdlib ;; - ubuntu-16.04) + ubuntu-1[6,8].04) apt-get update apt-get -y install wget curl sudo unzip puppet software-properties-common puppet-module-puppetlabs-apt puppet-module-puppetlabs-stdlib ;; diff --git a/build.gradle b/build.gradle index 431c596a46..d469850713 100644 --- a/build.gradle +++ b/build.gradle @@ -409,7 +409,7 @@ task "configure-nexus"(dependsOn: tasks.findAll { alltask -> alltask.name.starts task "bigtop-puppet"(type:Exec, description: 'Build bigtop/puppet images.\n' + - 'Usage:\n $ ./gradlew -POS=[centos-7|fedora-26|debian-9|ubuntu-16.04|opensuse-42.3] -Pprefix=STRING_TO_PREFIX bigtop-puppet\n' + + 'Usage:\n $ ./gradlew -POS=[centos-7|fedora-26|debian-9|ubuntu-16.04|ubuntu-18.04|opensuse-42.3] -Pprefix=STRING_TO_PREFIX bigtop-puppet\n' + 'Example:\n $ ./gradlew -POS=debian-9 -Pprefix=1.0.0 bigtop-puppet\n' + 'The built image name: bigtop/puppet:1.0.0-debian-9', group: DOCKERBUILD_GROUP) { @@ -424,7 +424,7 @@ task "bigtop-puppet"(type:Exec, task "bigtop-slaves"(type:Exec, description: 'Build bigtop/slaves images.\n' + - 'Usage:\n $ ./gradlew -POS=[centos-7|fedora-26|debian-9|ubuntu-16.04|opensuse-42.3] -Pprefix=STRING_TO_PREFIX bigtop-slaves\n' + + 'Usage:\n $ ./gradlew -POS=[centos-7|fedora-26|debian-9|ubuntu-16.04|ubuntu-18.04|opensuse-42.3] -Pprefix=STRING_TO_PREFIX bigtop-slaves\n' + 'Example:\n $ ./gradlew -POS=debian-9 -Pprefix=1.0.0 bigtop-slaves\n' + 'The built image name: bigtop/slaves:1.0.0-debian-9', group: DOCKERBUILD_GROUP) { diff --git a/docker/bigtop-slaves/Dockerfile.template b/docker/bigtop-slaves/Dockerfile.template index ad92136c37..f13fdec3d6 100644 --- a/docker/bigtop-slaves/Dockerfile.template +++ b/docker/bigtop-slaves/Dockerfile.template @@ -19,6 +19,6 @@ MAINTAINER dev@bigtop.apache.org COPY bigtop_toolchain PUPPET_MODULES -RUN UPDATE_SOURCE && puppet apply -e "include bigtop_toolchain::installer" +RUN UPDATE_SOURCE && puppet apply --modulepath=/etc/puppet/modules:/usr/share/puppet/modules -e "include bigtop_toolchain::installer" COPY . /tmp/bigtop RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/* diff --git a/docker/sandbox/sandbox-env.sh b/docker/sandbox/sandbox-env.sh index fa15e2aae4..b293415416 100644 --- a/docker/sandbox/sandbox-env.sh +++ b/docker/sandbox/sandbox-env.sh @@ -31,4 +31,5 @@ DEBS=( \ debian-8-aarch64 \ debian-9-aarch64 \ ubuntu-16.04 \ + ubuntu-18.04 \ ) diff --git a/provisioner/docker/config_ubuntu-18.04.yaml b/provisioner/docker/config_ubuntu-18.04.yaml new file mode 100644 index 0000000000..731364096c --- /dev/null +++ b/provisioner/docker/config_ubuntu-18.04.yaml @@ -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. + +docker: + memory_limit: "4g" + image: "bigtop/puppet:trunk-ubuntu-18.04" + +repo: "http://repos.bigtop.apache.org/releases/1.2.1/ubuntu/18.04/x86_64" +distro: debian +components: [hdfs, yarn, mapreduce] +enable_local_repo: true +smoke_test_components: [hdfs, yarn, mapreduce] From 987450edd7094b972537cd162bf82666c5fa6602 Mon Sep 17 00:00:00 2001 From: Epikhin Mikhail Date: Mon, 16 Jul 2018 12:21:59 +0300 Subject: [PATCH 2/2] Add support ubuntu 18.04 --- bigtop_toolchain/bin/puppetize.sh | 2 +- build.gradle | 4 ++-- docker/bigtop-slaves/Dockerfile.template | 2 +- docker/sandbox/sandbox-env.sh | 1 + provisioner/docker/config_ubuntu-18.04.yaml | 24 +++++++++++++++++++++ 5 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 provisioner/docker/config_ubuntu-18.04.yaml diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh index b438f44a21..39f0e3a2f7 100755 --- a/bigtop_toolchain/bin/puppetize.sh +++ b/bigtop_toolchain/bin/puppetize.sh @@ -26,7 +26,7 @@ case ${ID}-${VERSION_ID} in dnf -y check-update dnf -y install hostname findutils curl sudo unzip wget puppet puppetlabs-stdlib ;; - ubuntu-16.04) + ubuntu-1[6,8].04) apt-get update apt-get -y install wget curl sudo unzip puppet software-properties-common puppet-module-puppetlabs-apt puppet-module-puppetlabs-stdlib ;; diff --git a/build.gradle b/build.gradle index 431c596a46..d469850713 100644 --- a/build.gradle +++ b/build.gradle @@ -409,7 +409,7 @@ task "configure-nexus"(dependsOn: tasks.findAll { alltask -> alltask.name.starts task "bigtop-puppet"(type:Exec, description: 'Build bigtop/puppet images.\n' + - 'Usage:\n $ ./gradlew -POS=[centos-7|fedora-26|debian-9|ubuntu-16.04|opensuse-42.3] -Pprefix=STRING_TO_PREFIX bigtop-puppet\n' + + 'Usage:\n $ ./gradlew -POS=[centos-7|fedora-26|debian-9|ubuntu-16.04|ubuntu-18.04|opensuse-42.3] -Pprefix=STRING_TO_PREFIX bigtop-puppet\n' + 'Example:\n $ ./gradlew -POS=debian-9 -Pprefix=1.0.0 bigtop-puppet\n' + 'The built image name: bigtop/puppet:1.0.0-debian-9', group: DOCKERBUILD_GROUP) { @@ -424,7 +424,7 @@ task "bigtop-puppet"(type:Exec, task "bigtop-slaves"(type:Exec, description: 'Build bigtop/slaves images.\n' + - 'Usage:\n $ ./gradlew -POS=[centos-7|fedora-26|debian-9|ubuntu-16.04|opensuse-42.3] -Pprefix=STRING_TO_PREFIX bigtop-slaves\n' + + 'Usage:\n $ ./gradlew -POS=[centos-7|fedora-26|debian-9|ubuntu-16.04|ubuntu-18.04|opensuse-42.3] -Pprefix=STRING_TO_PREFIX bigtop-slaves\n' + 'Example:\n $ ./gradlew -POS=debian-9 -Pprefix=1.0.0 bigtop-slaves\n' + 'The built image name: bigtop/slaves:1.0.0-debian-9', group: DOCKERBUILD_GROUP) { diff --git a/docker/bigtop-slaves/Dockerfile.template b/docker/bigtop-slaves/Dockerfile.template index ad92136c37..f13fdec3d6 100644 --- a/docker/bigtop-slaves/Dockerfile.template +++ b/docker/bigtop-slaves/Dockerfile.template @@ -19,6 +19,6 @@ MAINTAINER dev@bigtop.apache.org COPY bigtop_toolchain PUPPET_MODULES -RUN UPDATE_SOURCE && puppet apply -e "include bigtop_toolchain::installer" +RUN UPDATE_SOURCE && puppet apply --modulepath=/etc/puppet/modules:/usr/share/puppet/modules -e "include bigtop_toolchain::installer" COPY . /tmp/bigtop RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/* diff --git a/docker/sandbox/sandbox-env.sh b/docker/sandbox/sandbox-env.sh index fa15e2aae4..b293415416 100644 --- a/docker/sandbox/sandbox-env.sh +++ b/docker/sandbox/sandbox-env.sh @@ -31,4 +31,5 @@ DEBS=( \ debian-8-aarch64 \ debian-9-aarch64 \ ubuntu-16.04 \ + ubuntu-18.04 \ ) diff --git a/provisioner/docker/config_ubuntu-18.04.yaml b/provisioner/docker/config_ubuntu-18.04.yaml new file mode 100644 index 0000000000..731364096c --- /dev/null +++ b/provisioner/docker/config_ubuntu-18.04.yaml @@ -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. + +docker: + memory_limit: "4g" + image: "bigtop/puppet:trunk-ubuntu-18.04" + +repo: "http://repos.bigtop.apache.org/releases/1.2.1/ubuntu/18.04/x86_64" +distro: debian +components: [hdfs, yarn, mapreduce] +enable_local_repo: true +smoke_test_components: [hdfs, yarn, mapreduce]