diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml
index 251ca72f0..230228290 100644
--- a/.github/workflows/license.yml
+++ b/.github/workflows/license.yml
@@ -37,7 +37,7 @@ jobs:
with:
distribution: zulu
java-version: 8
- - run: build/mvn org.apache.rat:apache-rat-plugin:check -Ptpcds -Pspark-block-cleaner -Pkubernetes -Pspark-3.1 -Pspark-3.2
+ - run: build/mvn org.apache.rat:apache-rat-plugin:check -Ptpcds -Pspark-block-cleaner -Pkubernetes-deployment-it -Pspark-3.1 -Pspark-3.2
- name: Upload rat report
if: failure()
uses: actions/upload-artifact@v2
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 7cbe47de4..5b8cca23d 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -172,14 +172,14 @@ jobs:
kubectl create serviceaccount kyuubi
kubectl get serviceaccount
- name: start kyuubi
- run: kubectl apply -f kubernetes/integration-tests/test-k8s.yaml
+ run: kubectl apply -f integration-tests/kyuubi-kubernetes-deployment-it/test-k8s.yaml
- name: kyuubi pod check
run: kubectl get pods
- name: integration tests
run: >-
./build/mvn clean install -Dmaven.javadoc.skip=true -Drat.skip=true -Dscalastyle.skip=true -Dspotless.check.skip -V
- -pl kubernetes/integration-tests -am
- -Pkubernetes
+ -pl integration-tests/kyuubi-kubernetes-deployment-it -am
+ -Pkubernetes-deployment-it
-Dtest=none -DwildcardSuites=org.apache.kyuubi.kubernetes.test
- name: Upload test logs
if: failure()
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
index 93520f4e4..6c469b9c2 100644
--- a/.github/workflows/style.yml
+++ b/.github/workflows/style.yml
@@ -33,7 +33,7 @@ jobs:
strategy:
matrix:
profiles:
- - '-Ptpcds -Pspark-block-cleaner -Pkubernetes -Pspark-3.1 -Pspark-3.2'
+ - '-Ptpcds -Pspark-block-cleaner -Pkubernetes-deployment-it -Pspark-3.1 -Pspark-3.2'
steps:
- uses: actions/checkout@v2.3.5
- name: Setup JDK 8
diff --git a/integration-tests/kyuubi-flink-it/pom.xml b/integration-tests/kyuubi-flink-it/pom.xml
index 971204e84..f444ad8e3 100644
--- a/integration-tests/kyuubi-flink-it/pom.xml
+++ b/integration-tests/kyuubi-flink-it/pom.xml
@@ -28,7 +28,7 @@
4.0.0
kyuubi-flink-it_2.12
- Kyuubi Project IT Flink SQL
+ Kyuubi Test Flink SQL IT
diff --git a/kubernetes/integration-tests/pom.xml b/integration-tests/kyuubi-kubernetes-deployment-it/pom.xml
similarity index 91%
rename from kubernetes/integration-tests/pom.xml
rename to integration-tests/kyuubi-kubernetes-deployment-it/pom.xml
index 072e7391a..75f512e5d 100644
--- a/kubernetes/integration-tests/pom.xml
+++ b/integration-tests/kyuubi-kubernetes-deployment-it/pom.xml
@@ -21,13 +21,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
org.apache.kyuubi
- kyuubi-parent
+ integration-tests
1.5.0-SNAPSHOT
- ../../pom.xml
+ ../pom.xml
- kubernetes-integration-tests_2.12
- Kyuubi Kubernetes Integration Tests
+ kubernetes-deployment-integration-tests_2.12
+ Kyuubi Test Kubernetes Deployment IT
4.0.0
diff --git a/kubernetes/integration-tests/src/test/resources/log4j.properties b/integration-tests/kyuubi-kubernetes-deployment-it/src/test/resources/log4j.properties
similarity index 100%
rename from kubernetes/integration-tests/src/test/resources/log4j.properties
rename to integration-tests/kyuubi-kubernetes-deployment-it/src/test/resources/log4j.properties
diff --git a/kubernetes/integration-tests/src/test/scala/org/apache/kyuubi/kubernetes/test/KubernetesJDBCTestsSuite.scala b/integration-tests/kyuubi-kubernetes-deployment-it/src/test/scala/org/apache/kyuubi/kubernetes/test/KubernetesJDBCTestsSuite.scala
similarity index 100%
rename from kubernetes/integration-tests/src/test/scala/org/apache/kyuubi/kubernetes/test/KubernetesJDBCTestsSuite.scala
rename to integration-tests/kyuubi-kubernetes-deployment-it/src/test/scala/org/apache/kyuubi/kubernetes/test/KubernetesJDBCTestsSuite.scala
diff --git a/kubernetes/integration-tests/src/test/scala/org/apache/kyuubi/kubernetes/test/MiniKube.scala b/integration-tests/kyuubi-kubernetes-deployment-it/src/test/scala/org/apache/kyuubi/kubernetes/test/MiniKube.scala
similarity index 100%
rename from kubernetes/integration-tests/src/test/scala/org/apache/kyuubi/kubernetes/test/MiniKube.scala
rename to integration-tests/kyuubi-kubernetes-deployment-it/src/test/scala/org/apache/kyuubi/kubernetes/test/MiniKube.scala
diff --git a/kubernetes/integration-tests/src/test/scala/org/apache/kyuubi/kubernetes/test/ProcessUtils.scala b/integration-tests/kyuubi-kubernetes-deployment-it/src/test/scala/org/apache/kyuubi/kubernetes/test/ProcessUtils.scala
similarity index 100%
rename from kubernetes/integration-tests/src/test/scala/org/apache/kyuubi/kubernetes/test/ProcessUtils.scala
rename to integration-tests/kyuubi-kubernetes-deployment-it/src/test/scala/org/apache/kyuubi/kubernetes/test/ProcessUtils.scala
diff --git a/kubernetes/integration-tests/test-k8s.yaml b/integration-tests/kyuubi-kubernetes-deployment-it/test-k8s.yaml
similarity index 100%
rename from kubernetes/integration-tests/test-k8s.yaml
rename to integration-tests/kyuubi-kubernetes-deployment-it/test-k8s.yaml
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index df58e73d9..fc46c363f 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -35,4 +35,12 @@
kyuubi-flink-it
+
+
+ kubernetes-deployment-it
+
+ kyuubi-kubernetes-deployment-it
+
+
+
diff --git a/pom.xml b/pom.xml
index c3437c07d..4a2360baa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1799,13 +1799,6 @@
-
- kubernetes
-
- kubernetes/integration-tests
-
-
-
apache-release