[bigtop] branch master updated: BIGTOP-3392. All packaging jobs are failing on Fedora 31 for aarch64 and ppc64le. (#663)

[sekikn]

This is an automated email from the ASF dual-hosted git repository.

sekikn 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 a69e3f1  BIGTOP-3392. All packaging jobs are failing on Fedora 31 for 
aarch64 and ppc64le. (#663)
a69e3f1 is described below

commit a69e3f1a564bf33407456b73d5be9cc5d5a44020
Author: Kengo Seki <sek...@apache.org>
AuthorDate: Mon Aug 31 22:24:37 2020 +0900

    BIGTOP-3392. All packaging jobs are failing on Fedora 31 for aarch64 and 
ppc64le. (#663)
---
 bigtop-ci/build.sh |  8 ++++++--
 packages.gradle    | 14 +++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/bigtop-ci/build.sh b/bigtop-ci/build.sh
index 9f85250..a79e496 100755
--- a/bigtop-ci/build.sh
+++ b/bigtop-ci/build.sh
@@ -17,7 +17,7 @@
 BIGTOP_HOME=`cd $(dirname $0)/.. && pwd`
 
 usage() {
-    echo "usage build.sh --prefix trunk|1.3.0|1.2.1|... --os 
debian-8|centos-7|... --target hadoop|tez|... [--nexus]"
+    echo "usage build.sh --prefix trunk|1.4.0|1.3.0|... --os 
debian-9|centos-7|... --target hadoop|tez|... [--nexus] [--docker-run-option 
...]"
     exit 1 # unknown option
 }
 
@@ -46,6 +46,10 @@ case $key in
     CONFIGURE_NEXUS="configure-nexus"
     shift
     ;;
+    --docker-run-option)
+    DOCKER_RUN_OPTION="$2"
+    shift
+    ;;
     *)
     usage
     ;;
@@ -72,7 +76,7 @@ if [ "x86_64" != $ARCH ]; then
 fi
 
 # Start up build container
-CONTAINER_ID=`docker run -d $NEXUS $IMAGE_NAME /sbin/init`
+CONTAINER_ID=`docker run -d $DOCKER_RUN_OPTION $NEXUS $IMAGE_NAME /sbin/init`
 trap "docker rm -f $CONTAINER_ID" EXIT
 
 # Copy bigtop repo into container
diff --git a/packages.gradle b/packages.gradle
index acf39ec..5bf546c 100644
--- a/packages.gradle
+++ b/packages.gradle
@@ -628,13 +628,14 @@ def genTasks = { target ->
   }
   task "$target-pkg-ind" (
           description: "Invoking a native binary packaging for $target in 
Docker. Usage: \$ ./gradlew " +
-                  
"-POS=[centos-7|fedora-26|debian-9|ubuntu-16.04|opensuse-42.3] " +
-                  "-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] $target-pkg-ind " +
+                  "-POS=[centos-7|fedora-31|debian-9|ubuntu-16.04] " +
+                  "-Pprefix=[trunk|1.4.0|1.3.0|1.2.1|...] $target-pkg-ind " +
                   "-Pnexus=[true|false]",
           group: PACKAGES_GROUP) doLast {
     def _prefix = project.hasProperty("prefix") ? prefix : "trunk"
     def _OS = project.hasProperty("OS") ? OS : "centos-7"
     def _target_pkg = "$target-pkg"
+    def _docker_run_option = project.hasProperty("docker-run-option") ? 
this.'docker-run-option' : ""
     def additionalConfigKeys = ['git_repo', 'git_ref', 'git_dir', 
'git_commit_hash', 'base_version']
     additionalConfigKeys.each { key ->
       if (project.hasProperty(key)) {
@@ -647,6 +648,7 @@ def genTasks = { target ->
             '--prefix', _prefix,
             '--os', _OS,
             '--target', _target_pkg,
+            '--docker-run-option', _docker_run_option,
     ]
     if ( project.hasProperty("nexus") ) {
       command.add('--nexus')
@@ -845,17 +847,19 @@ if (nativePackaging) {
 
 task "repo-ind" (
     description: "Invoking a native repository in Docker. Usage: \$ ./gradlew 
" +
-            "-POS=[centos-7|fedora-26|debian-9|ubuntu-16.04|opensuse-42.3] " +
-            "-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] repo-ind",
+            "-POS=[centos-7|fedora-31|debian-9|ubuntu-16.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"
   def _OS = project.hasProperty("OS") ? OS : "centos-7"
+  def _docker_run_option = project.hasProperty("docker-run-option") ? 
this.'docker-run-option' : ""
   def command = [
       'bash', '-x',
       './bigtop-ci/build.sh',
       '--prefix', _prefix,
       '--os', _OS,
-      '--target', 'repo'
+      '--target', 'repo',
+      '--docker-run-option', _docker_run_option
   ]
   exec {
     workingDir BASE_DIR