(kyuubi) branch branch-1.8 updated: [KYUUBI #5978] Canonicalize Trino IT in GitHub Action workflow

[chengpan]

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

chengpan pushed a commit to branch branch-1.8
in repository https://gitbox.apache.org/repos/asf/kyuubi.git


The following commit(s) were added to refs/heads/branch-1.8 by this push:
     new b22b7848e [KYUUBI #5978] Canonicalize Trino IT in GitHub Action 
workflow
b22b7848e is described below

commit b22b7848ec12182c7724e03318ffe0135cf6427c
Author: Cheng Pan <cheng...@apache.org>
AuthorDate: Tue Jan 16 12:19:31 2024 +0800

    [KYUUBI #5978] Canonicalize Trino IT in GitHub Action workflow
    
    # :mag: Description
    ## Issue References 🔗
    
    This pull request canonicalizes Trino IT in GitHub Action workflow.
    
    `mvn -am` means "also make", so that `mvn integration-tests/kyuubi-trino-it 
-am` would trigger compiling of `kyuubi-server`, 
`externals/kyuubi-spark-sql-engine`, `externals/kyuubi-download` modules 
automatically.
    
    ## Describe Your Solution 🔧
    
    CI part change in 
https://github.com/apache/kyuubi/commit/6688b3dacf80ac519f6a0d56f8168d15166f5916
 is unnecessary.
    
    ## Types of changes :bookmark:
    
    - [ ] Bugfix (non-breaking change which fixes an issue)
    - [ ] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would cause existing 
functionality to change)
    
    ## Test Plan 🧪
    
    Pass GA.
    
    ---
    
    # Checklist 📝
    
    - [x] This patch was not authored or co-authored using [Generative 
Tooling](https://www.apache.org/legal/generative-tooling.html)
    
    **Be nice. Be informative.**
    
    Closes #5978 from pan3793/trino-ci.
    
    Closes #5978
    
    1b8ef94d1 [Cheng Pan] set KYUUBI_HOME in trino-it
    18e72d355 [Cheng Pan] Canonicalize Trino IT in GitHub Action workflow
    
    Authored-by: Cheng Pan <cheng...@apache.org>
    Signed-off-by: Cheng Pan <cheng...@apache.org>
    (cherry picked from commit 3915fe865060881c24962e7b1a6cae5a04c6b72b)
    Signed-off-by: Cheng Pan <cheng...@apache.org>
---
 .github/workflows/master.yml                                     | 6 +++---
 .../org/apache/kyuubi/it/trino/server/TrinoFrontendSuite.scala   | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index b6d9b504b..9cd6b756d 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -396,9 +396,9 @@ jobs:
         uses: ./.github/actions/cache-engine-archives
       - name: Build and test Trino with maven w/o linters
         run: |
-          
TEST_MODULES="kyuubi-server,externals/kyuubi-trino-engine,externals/kyuubi-spark-sql-engine,externals/kyuubi-download,integration-tests/kyuubi-trino-it"
-          ./build/mvn ${MVN_OPT} -pl ${TEST_MODULES} -am -Pflink-provided 
-Phive-provided clean install -DskipTests
-          ./build/mvn -Dmaven.javadoc.skip=true -Drat.skip=true 
-Dscalastyle.skip=true -Dspotless.check.skip -pl ${TEST_MODULES} -am 
-Pflink-provided -Phive-provided test -Dtest=none 
-DwildcardSuites=org.apache.kyuubi.it.trino.operation.TrinoOperationSuite,org.apache.kyuubi.it.trino.server.TrinoFrontendSuite
+          
TEST_MODULES="externals/kyuubi-trino-engine,integration-tests/kyuubi-trino-it"
+          ./build/mvn ${MVN_OPT} -pl ${TEST_MODULES} -am clean install 
-DskipTests
+          ./build/mvn ${MVN_OPT} -pl ${TEST_MODULES} test
       - name: Upload test logs
         if: failure()
         uses: actions/upload-artifact@v3
diff --git 
a/integration-tests/kyuubi-trino-it/src/test/scala/org/apache/kyuubi/it/trino/server/TrinoFrontendSuite.scala
 
b/integration-tests/kyuubi-trino-it/src/test/scala/org/apache/kyuubi/it/trino/server/TrinoFrontendSuite.scala
index 7575bf8a9..208652436 100644
--- 
a/integration-tests/kyuubi-trino-it/src/test/scala/org/apache/kyuubi/it/trino/server/TrinoFrontendSuite.scala
+++ 
b/integration-tests/kyuubi-trino-it/src/test/scala/org/apache/kyuubi/it/trino/server/TrinoFrontendSuite.scala
@@ -19,8 +19,9 @@ package org.apache.kyuubi.it.trino.server
 
 import scala.util.control.NonFatal
 
-import org.apache.kyuubi.WithKyuubiServer
+import org.apache.kyuubi.{Utils, WithKyuubiServer}
 import org.apache.kyuubi.config.KyuubiConf
+import org.apache.kyuubi.config.KyuubiConf.{KYUUBI_ENGINE_ENV_PREFIX, 
KYUUBI_HOME}
 import org.apache.kyuubi.operation.SparkMetadataTests
 
 /**
@@ -53,8 +54,12 @@ class TrinoFrontendSuite extends WithKyuubiServer with 
SparkMetadataTests {
     }
   }
 
+  val kyuubiHome: String = 
Utils.getCodeSourceLocation(getClass).split("integration-tests").head
+
   override protected val conf: KyuubiConf = {
-    KyuubiConf().set(KyuubiConf.FRONTEND_PROTOCOLS, Seq("TRINO"))
+    KyuubiConf()
+      .set(KyuubiConf.FRONTEND_PROTOCOLS, Seq("TRINO"))
+      .set(s"$KYUUBI_ENGINE_ENV_PREFIX.$KYUUBI_HOME", kyuubiHome)
   }
 
   override protected def jdbcUrl: String = {