From 385b252468dddfce43ccd1071961e9deb71fbaa5 Mon Sep 17 00:00:00 2001
From: Hongze Zhang <hongze.zhang@intel.com>
Date: Fri, 29 Dec 2023 16:49:19 +0800
Subject: [PATCH] [VL] Revert "[VL] Minor fix for CI" (#4230)

---
 .github/workflows/ch_code_style.yml                    |  2 +-
 .github/workflows/code_style.yml                       |  2 +-
 .github/workflows/velox_be.yml                         | 10 +++++-----
 .github/workflows/velox_tpch_bench.yml                 |  6 +++---
 .github/workflows/velox_tpch_merge.yml                 |  8 ++++----
 .../spark/sql/connector/GlutenDataSourceV2Suite.scala  |  3 ++-
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ch_code_style.yml b/.github/workflows/ch_code_style.yml
index 5bc0b6071bd2..1428bdc166be 100644
--- a/.github/workflows/ch_code_style.yml
+++ b/.github/workflows/ch_code_style.yml
@@ -16,7 +16,7 @@
 name: CH Backend Code style checks
 
 on:
-  pull_request_target
+  pull_request
 
 concurrency:
   group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
diff --git a/.github/workflows/code_style.yml b/.github/workflows/code_style.yml
index 058f4d66515e..e932790755e6 100644
--- a/.github/workflows/code_style.yml
+++ b/.github/workflows/code_style.yml
@@ -16,7 +16,7 @@
 name: Code style checks
 
 on:
-  pull_request_target
+  pull_request
 
 concurrency:
   group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
diff --git a/.github/workflows/velox_be.yml b/.github/workflows/velox_be.yml
index c50f66914292..7da065e5b735 100644
--- a/.github/workflows/velox_be.yml
+++ b/.github/workflows/velox_be.yml
@@ -16,7 +16,7 @@
 name: Velox backend
 
 on:
-  pull_request_target:
+  pull_request:
     paths:
       - '.github/**'
       - 'pom.xml'
@@ -38,10 +38,10 @@ on:
 #      - 'substrait/substrait-spark/**'
 
 env:
-  HTTP_PROXY_HOST: ${{ secrets.SHR_IL_HTTP_PROXY_HOST }}
-  HTTP_PROXY_PORT: ${{ secrets.SHR_IL_HTTP_PROXY_PORT }}
-  DOCKER_REGISTRY_HOST: ${{ secrets.SHR_IL_DOCKER_REGISTRY_HOST }}
-  DOCKER_REGISTRY_PORT: ${{ secrets.SHR_IL_DOCKER_REGISTRY_PORT }}
+  HTTP_PROXY_HOST: 10.240.252.16
+  HTTP_PROXY_PORT: 911
+  DOCKER_REGISTRY_HOST: 10.0.2.4
+  DOCKER_REGISTRY_PORT: 5000
 
 concurrency:
   group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
diff --git a/.github/workflows/velox_tpch_bench.yml b/.github/workflows/velox_tpch_bench.yml
index eed3487ec7f7..87d71a604fa0 100644
--- a/.github/workflows/velox_tpch_bench.yml
+++ b/.github/workflows/velox_tpch_bench.yml
@@ -20,9 +20,9 @@ on:
     types: [created, edited, deleted]
 
 env:
-  JENKINS_HOST: ${{ secrets.SHR_IL_JENKINS_HOST }}
-  JENKINS_PORT: ${{ secrets.SHR_IL_JENKINS_PORT }}
-  JENKINS_USER: ${{ secrets.SHR_IL_JENKINS_USER }}
+  JENKINS_HOST: 10.0.0.68
+  JENKINS_PORT: 8080
+  JENKINS_USER: jenkins:11fd1b5a82bfd638bd9b3749c96b324ff2
 
 jobs:
   velox-trigger-benchmark-on-comment:
diff --git a/.github/workflows/velox_tpch_merge.yml b/.github/workflows/velox_tpch_merge.yml
index f962d99c446b..5012e830111e 100644
--- a/.github/workflows/velox_tpch_merge.yml
+++ b/.github/workflows/velox_tpch_merge.yml
@@ -16,7 +16,7 @@
 name: Velox backend Performance Tests on Merge
 
 on:
-  pull_request_target:
+  pull_request:
     types: [ closed ]
     branches:
       - main
@@ -39,9 +39,9 @@ on:
       - 'dev/**'
 
 env:
-  JENKINS_HOST: ${{ secrets.SHR_IL_JENKINS_HOST }}
-  JENKINS_PORT: ${{ secrets.SHR_IL_JENKINS_PORT }}
-  JENKINS_USER: ${{ secrets.SHR_IL_JENKINS_USER }}
+  JENKINS_HOST: 10.0.0.68
+  JENKINS_PORT: 8080
+  JENKINS_USER: jenkins:11fd1b5a82bfd638bd9b3749c96b324ff2
 
 jobs:
   velox-trigger-benchmark:
diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/connector/GlutenDataSourceV2Suite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/connector/GlutenDataSourceV2Suite.scala
index 7e284f621711..82cec0bbbbfe 100644
--- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/connector/GlutenDataSourceV2Suite.scala
+++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/connector/GlutenDataSourceV2Suite.scala
@@ -74,7 +74,8 @@ class GlutenDataSourceV2Suite extends DataSourceV2Suite with GlutenSQLTestsBaseT
       ).foreach {
         cls =>
           withClue(cls.getName) {
-            // we test report ordering (together with report partitioning) with these transformations:
+            // we test report ordering (together with report partitioning) with these
+            // transformations:
             // - groupBy("i").flatMapGroups:
             //   hash-partitions by "i" and sorts each partition by "i"
             //   requires partitioning and sort by "i"