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 551b6a1bf BIGTOP-4232. Drop Ubuntu-18.04 (#1297)
551b6a1bf is described below
commit 551b6a1bfecdd980728a08fe15eda40972d3df96
Author: masatana <[email protected]>
AuthorDate: Wed Sep 25 07:47:59 2024 +0900
BIGTOP-4232. Drop Ubuntu-18.04 (#1297)
---
bigtop_toolchain/bin/puppetize.sh | 2 +-
build.gradle | 6 +++---
packages.gradle | 4 ++--
provisioner/docker/config_ubuntu-18.04.yaml | 24 ------------------------
4 files changed, 6 insertions(+), 30 deletions(-)
diff --git a/bigtop_toolchain/bin/puppetize.sh
b/bigtop_toolchain/bin/puppetize.sh
index 54e7c1241..071062443 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -31,7 +31,7 @@ case ${ID}-${VERSION_ID} in
puppet module install puppetlabs-stdlib --version 4.12.0
echo 'include_legacy_facts=true' >> /etc/puppet/puppet.conf
;;
- ubuntu-18.04|ubuntu-22.04)
+ ubuntu-22.04)
apt-get update
apt-get -y install wget curl sudo unzip puppet
software-properties-common puppet-module-puppetlabs-apt
puppet-module-puppetlabs-stdlib systemd-sysv
;;
diff --git a/build.gradle b/build.gradle
index a84e4d4d6..3ffdcb397 100644
--- a/build.gradle
+++ b/build.gradle
@@ -266,7 +266,7 @@ Properties:
-Pmemory=[4g|8g|...]
-Pnum_instances=[NUM_INSTANCES]
-Pnexus=[NEXUS_URL] (NEXUS_URL is optional)
- -POS=[rockylinux-8|fedora-35|ubuntu-18.04|opensuse-42.3|openeuler-22.03]
+ -POS=[rockylinux-8|fedora-35|ubuntu-22.04|opensuse-42.3|openeuler-22.03]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...]
-Prepository=[REPO_URL]
-Prun_smoke_tests (run test components defined in config file)
@@ -561,7 +561,7 @@ task "bigtop-puppet"(type:Exec,
description: '''
Build bigtop/puppet images
Usage:
- $ ./gradlew
-POS=[rockylinux-8|fedora-35|debian-11|ubuntu-18.04|opensuse-42.3|openeuler-22.03]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-puppet
+ $ ./gradlew
-POS=[rockylinux-8|fedora-35|debian-11|ubuntu-22.04|opensuse-42.3|openeuler-22.03]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-puppet
Example:
$ ./gradlew -POS=debian-11 -Pprefix=3.0.0 bigtop-puppet
The built image name: bigtop/puppet:3.0.0-debian-11
@@ -580,7 +580,7 @@ task "bigtop-slaves"(type:Exec,
description: '''
Build bigtop/slaves images
Usage:
- $ ./gradlew
-POS=[rockylinux-8|fedora-35|debian-11|ubuntu-18.04|opensuse-42.3|openeuler-22.03]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-slaves
+ $ ./gradlew
-POS=[rockylinux-8|fedora-35|debian-11|ubuntu-22.04|opensuse-42.3|openeuler-22.03]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-slaves
Example:
$ ./gradlew -POS=debian-11 -Pprefix=3.0.0 bigtop-slaves
The built image name: bigtop/slaves:3.0.0-debian-11
diff --git a/packages.gradle b/packages.gradle
index 31d0e3304..fbd19a5fa 100644
--- a/packages.gradle
+++ b/packages.gradle
@@ -745,7 +745,7 @@ def genTasks = { target ->
}
task "$target-pkg-ind" (
description: "Invoking a native binary packaging for $target in
Docker. Usage: \$ ./gradlew " +
- "-POS=[rockylinux-8|fedora-38|debian-11|ubuntu-18.04] " +
+ "-POS=[rockylinux-8|fedora-38|debian-11|ubuntu-22.04] " +
"-Pprefix=[trunk|1.4.0|1.3.0|1.2.1|...] $target-pkg-ind " +
"-Pnexus=[true|false]" +
"[-Ppreferred-java-version=[8|11]]" +
@@ -981,7 +981,7 @@ if (nativePackaging) {
task "repo-ind" (
description: "Invoking a native repository in Docker. Usage: \$ ./gradlew
" +
- "-POS=[rockylinux-8|fedora-38|debian-11|ubuntu-18.04] " +
+ "-POS=[rockylinux-8|fedora-38|debian-11|ubuntu-22.04] " +
"-Pprefix=[trunk|1.4.0|1.3.0|1.2.1|...] repo-ind",
group: PACKAGES_GROUP) doLast {
def _prefix = project.hasProperty("prefix") ? prefix : "trunk"
diff --git a/provisioner/docker/config_ubuntu-18.04.yaml
b/provisioner/docker/config_ubuntu-18.04.yaml
deleted file mode 100644
index bbd75332a..000000000
--- a/provisioner/docker/config_ubuntu-18.04.yaml
+++ /dev/null
@@ -1,24 +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.
-
-docker:
- memory_limit: "4g"
- image: "bigtop/puppet:trunk-ubuntu-18.04"
-
-repo: "http://repos.bigtop.apache.org/releases/3.3.0/ubuntu/18.04/$(ARCH)"
-distro: debian
-components: [hdfs, yarn, mapreduce]
-enable_local_repo: false
-smoke_test_components: [hdfs, yarn, mapreduce]
