From 979b9f69a0df2fbd8f11c4211fe6a1129de89b4d Mon Sep 17 00:00:00 2001 From: PHILO-HE Date: Fri, 7 Nov 2025 15:30:20 +0800 Subject: [PATCH 1/4] Initial --- .github/workflows/velox_backend_x86.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/velox_backend_x86.yml b/.github/workflows/velox_backend_x86.yml index e7afd1b189c..518ebca3b46 100644 --- a/.github/workflows/velox_backend_x86.yml +++ b/.github/workflows/velox_backend_x86.yml @@ -47,6 +47,7 @@ env: CCACHE_DIR: "${{ github.workspace }}/.ccache" # spark.sql.ansi.enabled defaults to false. SPARK_ANSI_SQL_MODE: false + SPARK_TEST_IMAGE: apache/gluten:centos-8-jdk8 concurrency: group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }} @@ -899,9 +900,11 @@ jobs: **/gluten-ut/**/core.* spark-test-spark35: + env: + SPARK_TEST_IMAGE: ${{ env.SPARK_TEST_IMAGE }} needs: build-native-lib-centos-7 runs-on: ubuntu-22.04 - container: apache/gluten:centos-8-jdk8 + container: ${{ env.SPARK_TEST_IMAGE }} steps: - uses: actions/checkout@v2 - name: Download All Artifacts From f4bc849e815e4a043e7d84d34006383fe10a6ca1 Mon Sep 17 00:00:00 2001 From: PHILO-HE Date: Fri, 7 Nov 2025 16:07:51 +0800 Subject: [PATCH 2/4] Fix --- .github/workflows/velox_backend_x86.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/velox_backend_x86.yml b/.github/workflows/velox_backend_x86.yml index 518ebca3b46..ab23c7c86ac 100644 --- a/.github/workflows/velox_backend_x86.yml +++ b/.github/workflows/velox_backend_x86.yml @@ -38,6 +38,12 @@ on: - 'ep/build-velox/**' - 'cpp/**' - 'dev/**' + workflow_dispatch: + inputs: + spark_test_image: + description: "Docker image to use" + required: true + default: apache/gluten:centos-8-jdk8 env: ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true @@ -47,7 +53,6 @@ env: CCACHE_DIR: "${{ github.workspace }}/.ccache" # spark.sql.ansi.enabled defaults to false. SPARK_ANSI_SQL_MODE: false - SPARK_TEST_IMAGE: apache/gluten:centos-8-jdk8 concurrency: group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }} @@ -900,11 +905,9 @@ jobs: **/gluten-ut/**/core.* spark-test-spark35: - env: - SPARK_TEST_IMAGE: ${{ env.SPARK_TEST_IMAGE }} needs: build-native-lib-centos-7 runs-on: ubuntu-22.04 - container: ${{ env.SPARK_TEST_IMAGE }} + container: ${{ inputs.SPARK_TEST_IMAGE }} steps: - uses: actions/checkout@v2 - name: Download All Artifacts From a9dc81bd933ffdf065f2b8b9bec7242f9ca9a851 Mon Sep 17 00:00:00 2001 From: PHILO-HE Date: Fri, 7 Nov 2025 17:57:19 +0800 Subject: [PATCH 3/4] Test --- .github/workflows/velox_backend_x86.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/velox_backend_x86.yml b/.github/workflows/velox_backend_x86.yml index ab23c7c86ac..3dedf5e90d8 100644 --- a/.github/workflows/velox_backend_x86.yml +++ b/.github/workflows/velox_backend_x86.yml @@ -41,7 +41,6 @@ on: workflow_dispatch: inputs: spark_test_image: - description: "Docker image to use" required: true default: apache/gluten:centos-8-jdk8 @@ -61,6 +60,7 @@ concurrency: jobs: build-native-lib-centos-7: runs-on: ubuntu-22.04 + container: ${{ inputs.spark_test_image }} steps: - uses: actions/checkout@v4 - name: Get Ccache @@ -72,6 +72,7 @@ jobs: ccache-centos7-release-default - name: Build Gluten native libraries run: | + cat /etc/os-release docker pull apache/gluten:vcpkg-centos-7 docker run -v $GITHUB_WORKSPACE:/work -w /work apache/gluten:vcpkg-centos-7 bash -c " set -e @@ -907,7 +908,6 @@ jobs: spark-test-spark35: needs: build-native-lib-centos-7 runs-on: ubuntu-22.04 - container: ${{ inputs.SPARK_TEST_IMAGE }} steps: - uses: actions/checkout@v2 - name: Download All Artifacts From 90ff42a8ee28f2db9efe6a50ce5ccfdd4dbed13f Mon Sep 17 00:00:00 2001 From: PHILO-HE Date: Fri, 7 Nov 2025 18:11:41 +0800 Subject: [PATCH 4/4] Test --- .github/workflows/velox_backend_x86.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/velox_backend_x86.yml b/.github/workflows/velox_backend_x86.yml index 3dedf5e90d8..8ebdb21e070 100644 --- a/.github/workflows/velox_backend_x86.yml +++ b/.github/workflows/velox_backend_x86.yml @@ -60,7 +60,8 @@ concurrency: jobs: build-native-lib-centos-7: runs-on: ubuntu-22.04 - container: ${{ inputs.spark_test_image }} + container: + image: ${{ inputs.spark_test_image }} steps: - uses: actions/checkout@v4 - name: Get Ccache @@ -72,6 +73,7 @@ jobs: ccache-centos7-release-default - name: Build Gluten native libraries run: | + echo "input value: ${{ inputs.spark_test_image }}" cat /etc/os-release docker pull apache/gluten:vcpkg-centos-7 docker run -v $GITHUB_WORKSPACE:/work -w /work apache/gluten:vcpkg-centos-7 bash -c "