make modifications to the defaults.conf file and remove references to…

… $DOCKER_PUSH_REGISTRY
PHILO-HE · Jan 8, 2024 · f6b23f9 · f6b23f9
1 parent e9256e3
commit f6b23f9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/tools/gluten-te/centos/cbash-build.sh b/tools/gluten-te/centos/cbash-build.sh
@@ -46,7 +46,6 @@ CBASH_DOCKER_RUN_ARGS="$CBASH_DOCKER_RUN_ARGS --privileged"
 CBASH_DOCKER_RUN_ARGS="$CBASH_DOCKER_RUN_ARGS --ulimit nofile=65536:65536"
 CBASH_DOCKER_RUN_ARGS="$CBASH_DOCKER_RUN_ARGS --ulimit core=-1"
 CBASH_DOCKER_RUN_ARGS="$CBASH_DOCKER_RUN_ARGS --security-opt seccomp=unconfined"
-CBASH_DOCKER_RUN_ARGS="$CBASH_DOCKER_RUN_ARGS -e NUM_THREADS=30"
 if [ "$MOUNT_MAVEN_CACHE" == "ON" ]
 then
   CBASH_DOCKER_RUN_ARGS="$CBASH_DOCKER_RUN_ARGS -v $HOME/.m2/repository:/root/.m2/repository"

diff --git a/tools/gluten-te/centos/cbash-mount.sh b/tools/gluten-te/centos/cbash-mount.sh
@@ -57,4 +57,4 @@ CBASH_DOCKER_RUN_ARGS="$CBASH_DOCKER_RUN_ARGS $EXTRA_DOCKER_OPTIONS"
 CBASH_BASH_ARGS="$*"
 BASH_ARGS="$CBASH_BASH_ARGS"
 
-docker run $CBASH_DOCKER_RUN_ARGS $DOCKER_PUSH_REGISTRY/$DOCKER_TARGET_IMAGE_BUILDENV_WITH_OS_IMAGE bash -c "cd /opt/gluten && $BASH_ARGS"
+docker run $CBASH_DOCKER_RUN_ARGS $DOCKER_TARGET_IMAGE_BUILDENV_WITH_OS_IMAGE bash -c "cd /opt/gluten && $BASH_ARGS"
diff --git a/tools/gluten-te/centos/defaults.conf b/tools/gluten-te/centos/defaults.conf
@@ -34,12 +34,10 @@ DEFAULT_HTTP_PROXY_PORT=
 DEFAULT_USE_ALI_MAVEN_MIRROR=ON
 
 # Base operator system image used in build scripts.
-# DEFAULT_OS_IMAGE_NAME=ubuntu or centos
-DEFAULT_OS_IMAGE_NAME=
+DEFAULT_OS_IMAGE_NAME=centos
 
 # Version ID of os image
-# DEFAULT_OS_IMAGE_TAG=20.04 or 8
-DEFAULT_OS_IMAGE_TAG=
+DEFAULT_OS_IMAGE_TAG=8
 
 # Set timezone name
 DEFAULT_TIMEZONE=Asia/Shanghai

diff --git a/tools/gluten-te/ubuntu/defaults.conf b/tools/gluten-te/ubuntu/defaults.conf
@@ -34,12 +34,10 @@ DEFAULT_HTTP_PROXY_PORT=
 DEFAULT_USE_ALI_MAVEN_MIRROR=ON
 
 # Base operator system image used in build scripts.
-# DEFAULT_OS_IMAGE_NAME=ubuntu or centos
-DEFAULT_OS_IMAGE_NAME=
+DEFAULT_OS_IMAGE_NAME=ubuntu
 
 # Version ID of os image
-# DEFAULT_OS_IMAGE_TAG=20.04 or 8
-DEFAULT_OS_IMAGE_TAG=
+DEFAULT_OS_IMAGE_TAG=20.04
 
 
 # Set timezone name

diff --git a/tools/gluten-te/ubuntu/tpc.sh b/tools/gluten-te/ubuntu/tpc.sh
@@ -75,7 +75,7 @@ then
   exit 1
 fi
 
-DOCKER_SELECTED_TARGET_IMAGE_TPC_WITH_OS_IMAGE="$DOCKER_SELECTED_TARGET_IMAGE_TPC-$OS_IMAGE_NAME"
+DOCKER_SELECTED_TARGET_IMAGE_TPC_WITH_OS_IMAGE="$DOCKER_SELECTED_TARGET_IMAGE_TPC-$OS_IMAGE"
 
 TPC_DOCKER_BUILD_ARGS=
 TPC_DOCKER_BUILD_ARGS="$TPC_DOCKER_BUILD_ARGS --ulimit nofile=8192:8192"