everything_is_done_0.0.1

PHILO-HE · Dec 22, 2023 · c929e68 · c929e68
1 parent 757e0fc
commit c929e68
Show file tree

Hide file tree

Showing 8 changed files with 273 additions and 42 deletions.
diff --git a/.github/workflows/velox_be.yml b/.github/workflows/velox_be.yml
diff --git a/tools/gluten-te/centos/build.sh b/tools/gluten-te/centos/build.sh
@@ -54,7 +54,7 @@ BUILD_BACKEND_TYPE=${BUILD_BACKEND_TYPE:-$DEFAULT_BUILD_BACKEND_TYPE}
 # Build will result in this image
 DOCKER_TARGET_IMAGE_BUILD=${DOCKER_TARGET_IMAGE_BUILD:-$DEFAULT_DOCKER_TARGET_IMAGE_BUILD}
 
-DOCKER_TARGET_IMAGE_BUILD_WITH_OS_IMAGE="$DOCKER_TARGET_IMAGE_BUILD-$OS_IMAGE"
+DOCKER_TARGET_IMAGE_BUILD_WITH_OS_IMAGE="$DOCKER_TARGET_IMAGE_BUILD-$OS_IMAGE:$OS_VERSION"
 
 ##
 

diff --git a/tools/gluten-te/centos/buildenv.sh b/tools/gluten-te/centos/buildenv.sh
@@ -63,7 +63,7 @@ BUILDENV_DOCKER_BUILD_ARGS=
 BUILDENV_DOCKER_BUILD_ARGS="$BUILDENV_DOCKER_BUILD_ARGS --ulimit nofile=8192:8192"
 BUILDENV_DOCKER_BUILD_ARGS="$BUILDENV_DOCKER_BUILD_ARGS --build-arg BUILDKIT_INLINE_CACHE=1"
 BUILDENV_DOCKER_BUILD_ARGS="$BUILDENV_DOCKER_BUILD_ARGS --build-arg TIMEZONE=$TIMEZONE"
-BUILDENV_DOCKER_BUILD_ARGS="$BUILDENV_DOCKER_BUILD_ARGS --build-arg OS_IMAGE=$OS_IMAGE"
+BUILDENV_DOCKER_BUILD_ARGS="$BUILDENV_DOCKER_BUILD_ARGS --build-arg OS_IMAGE=$OS_IMAGE --build-arg OS_VERSION=$OS_VERSION"
 BUILDENV_DOCKER_BUILD_ARGS="$BUILDENV_DOCKER_BUILD_ARGS --build-arg MAVEN_MIRROR_URL=$MAVEN_MIRROR_URL"
 BUILDENV_DOCKER_BUILD_ARGS="$BUILDENV_DOCKER_BUILD_ARGS --build-arg HTTP_PROXY_HOST=$HTTP_PROXY_HOST"
 BUILDENV_DOCKER_BUILD_ARGS="$BUILDENV_DOCKER_BUILD_ARGS --build-arg HTTP_PROXY_PORT=$HTTP_PROXY_PORT"

diff --git a/tools/gluten-te/centos/defaults.conf b/tools/gluten-te/centos/defaults.conf
@@ -38,9 +38,11 @@ DEFAULT_HTTP_PROXY_PORT=913
 DEFAULT_USE_ALI_MAVEN_MIRROR=ON
 
 # Base operator system image used in build scripts.
+# DEFAULT_OS_IMAGE=ubuntu or centos
 DEFAULT_OS_IMAGE=
 
 # Version ID of os image
+# DEFAULT_OS_VERSION=20.04 or 8
 DEFAULT_OS_VERSION=
 
 # Set timezone name

diff --git a/tools/gluten-te/github_action/build.sh b/tools/gluten-te/github_action/build.sh
@@ -13,7 +13,6 @@
 # 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.
-#
 
 set -ex
 
@@ -45,7 +44,7 @@ else
   GLUTEN_DEBUG_BUILD=OFF
 fi
 
-#  The branches used to prepare dependencies
+# The branches used to prepare dependencies
 CACHE_GLUTEN_REPO=${CACHE_GLUTEN_REPO:-$DEFAULT_GLUTEN_REPO}
 CACHE_GLUTEN_BRANCH=${CACHE_GLUTEN_BRANCH:-$DEFAULT_GLUTEN_BRANCH}
 

diff --git a/tools/gluten-te/github_action/buildenv.sh b/tools/gluten-te/github_action/buildenv.sh
@@ -67,7 +67,7 @@ BUILDENV_DOCKER_BUILD_ARGS="$BUILDENV_DOCKER_BUILD_ARGS --build-arg OS_IMAGE=$OS
 BUILDENV_DOCKER_BUILD_ARGS="$BUILDENV_DOCKER_BUILD_ARGS --build-arg MAVEN_MIRROR_URL=$MAVEN_MIRROR_URL"
 BUILDENV_DOCKER_BUILD_ARGS="$BUILDENV_DOCKER_BUILD_ARGS --build-arg HTTP_PROXY_HOST=$HTTP_PROXY_HOST"
 BUILDENV_DOCKER_BUILD_ARGS="$BUILDENV_DOCKER_BUILD_ARGS --build-arg HTTP_PROXY_PORT=$HTTP_PROXY_PORT"
-BUILDENV_DOCKER_BUILD_ARGS="$BUILDENV_DOCKER_BUILD_ARGS -f $BASEDIR/dockerfile-buildenv-$OS_IMAGE"
+BUILDENV_DOCKER_BUILD_ARGS="$BUILDENV_DOCKER_BUILD_ARGS -f $BASEDIR/dockerfile-buildenv"
 BUILDENV_DOCKER_BUILD_ARGS="$BUILDENV_DOCKER_BUILD_ARGS --target gluten-buildenv"
 BUILDENV_DOCKER_BUILD_ARGS="$BUILDENV_DOCKER_BUILD_ARGS -t $DOCKER_TARGET_IMAGE_BUILDENV_WITH_OS_IMAGE"
 

diff --git a/tools/gluten-te/github_action/defaults.conf b/tools/gluten-te/github_action/defaults.conf
@@ -38,10 +38,11 @@ DEFAULT_HTTP_PROXY_PORT=913
 DEFAULT_USE_ALI_MAVEN_MIRROR=ON
 
 # Base operator system image used in build scripts.
-# DEFAULT_OS_IMAGE=ubuntu:20.04
+# DEFAULT_OS_IMAGE=ubuntu or centos
 DEFAULT_OS_IMAGE=
 
 # Version ID of os image
+# DEFAULT_OS_VERSION=20.04 or 8
 DEFAULT_OS_VERSION=
 
 # Set timezone name

diff --git a/tools/gluten-te/ubuntu/defaults.conf b/tools/gluten-te/ubuntu/defaults.conf
@@ -38,8 +38,14 @@ DEFAULT_HTTP_PROXY_PORT=913
 DEFAULT_USE_ALI_MAVEN_MIRROR=ON
 
 # Base operator system image used in build scripts.
+# DEFAULT_OS_IMAGE=ubuntu or centos
 DEFAULT_OS_IMAGE=
 
+# Version ID of os image
+# DEFAULT_OS_VERSION=20.04 or 8
+DEFAULT_OS_VERSION=
+
+
 # Set timezone name
 DEFAULT_TIMEZONE=Asia/Shanghai