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 1d8fad0f3 BIGTOP-4082: Fix installation failure or R by
bigtop_toolchain on openEuler (#1251)
1d8fad0f3 is described below
commit 1d8fad0f3af3ae155aa403521ba15cbbb0a6ec38
Author: Mac Chen <[email protected]>
AuthorDate: Thu Apr 11 18:00:41 2024 +0800
BIGTOP-4082: Fix installation failure or R by bigtop_toolchain on openEuler
(#1251)
---
build.gradle | 6 +++---
docker/bigtop-puppet/build.sh | 2 +-
docker/bigtop-slaves/build.sh | 2 +-
...fig_openeuler-22.03.yaml => config_openeuler-22.03-lts-sp1.yaml} | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/build.gradle b/build.gradle
index 31f45173a..42b07f897 100644
--- a/build.gradle
+++ b/build.gradle
@@ -267,7 +267,7 @@ Properties:
-Pmemory=[4g|8g|...]
-Pnum_instances=[NUM_INSTANCES]
-Pnexus=[NEXUS_URL] (NEXUS_URL is optional)
- -POS=[centos-7|fedora-35|ubuntu-18.04|opensuse-42.3|openeuler-22.03]
+ -POS=[centos-7|fedora-35|ubuntu-18.04|opensuse-42.3|openeuler-22.03-lts-sp1]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...]
-Prepository=[REPO_URL]
-Prun_smoke_tests (run test components defined in config file)
@@ -562,7 +562,7 @@ task "bigtop-puppet"(type:Exec,
description: '''
Build bigtop/puppet images
Usage:
- $ ./gradlew
-POS=[centos-7|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=[centos-7|fedora-35|debian-11|ubuntu-18.04|opensuse-42.3|openeuler-22.03-lts-sp1]
-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
@@ -581,7 +581,7 @@ task "bigtop-slaves"(type:Exec,
description: '''
Build bigtop/slaves images
Usage:
- $ ./gradlew
-POS=[centos-7|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=[centos-7|fedora-35|debian-11|ubuntu-18.04|opensuse-42.3|openeuler-22.03-lts-sp1]
-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/docker/bigtop-puppet/build.sh b/docker/bigtop-puppet/build.sh
index 879edafe1..f1564eab7 100755
--- a/docker/bigtop-puppet/build.sh
+++ b/docker/bigtop-puppet/build.sh
@@ -29,7 +29,7 @@ fi
PREFIX=$(echo "$1" | cut -d '-' -f 1)
OS=$(echo "$1" | cut -d '-' -f 2)
-VERSION=$(echo "$1" | cut -d '-' -f 3)
+VERSION=$(echo "$1" | cut -d '-' -f 3-)
ARCH=$(uname -m)
if [ "${ARCH}" != "x86_64" ];then
ARCH="-${ARCH}"
diff --git a/docker/bigtop-slaves/build.sh b/docker/bigtop-slaves/build.sh
index 0c440a923..dcd576a20 100755
--- a/docker/bigtop-slaves/build.sh
+++ b/docker/bigtop-slaves/build.sh
@@ -29,7 +29,7 @@ fi
PREFIX=$(echo "$1" | cut -d '-' -f 1)
OS=$(echo "$1" | cut -d '-' -f 2)
-VERSION=$(echo "$1" | cut -d '-' -f 3)
+VERSION=$(echo "$1" | cut -d '-' -f 3-)
ARCH=$(uname -m)
## Workaround for docker defect on linaros cloud
diff --git a/provisioner/docker/config_openeuler-22.03.yaml
b/provisioner/docker/config_openeuler-22.03-lts-sp1.yaml
similarity index 94%
rename from provisioner/docker/config_openeuler-22.03.yaml
rename to provisioner/docker/config_openeuler-22.03-lts-sp1.yaml
index a8fbe6ed5..e66d1e11d 100644
--- a/provisioner/docker/config_openeuler-22.03.yaml
+++ b/provisioner/docker/config_openeuler-22.03-lts-sp1.yaml
@@ -15,7 +15,7 @@
docker:
memory_limit: "4g"
- image: "bigtop/puppet:trunk-openeuler-22.03"
+ image: "bigtop/puppet:trunk-openeuler-22.03-lts-sp1"
repo:
"http://repios.bigtop.apache.org/releases/3.2.0/openEuler/22.03/$basearch";
distro: centos
