Skip to content

Commit a533b2f

Browse files
committed
[KYUUBI #1738] Unify kubernetes integration test
<!-- Thanks for sending a pull request! Here are some tips for you: 1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html 2. If the PR is related to an issue in https://github.com/apache/incubator-kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'. 3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'. --> ### _Why are the changes needed?_ <!-- Please clarify why the changes are needed. For instance, 1. If you add a feature, you can talk about the use case of it. 2. If you fix a bug, you can clarify why it is a bug. --> - Move kubernetes integration test into the new module `integration-test` - move the kubernetes profile into `integration-test` module since it is only used in test ### _How was this patch tested?_ Pass CI Closes #1738 from ulysses-you/unify-it. Closes #1738 2582823 [ulysses-you] Unify kubernetes integration test Authored-by: ulysses-you <ulyssesyou18@gmail.com> Signed-off-by: ulysses-you <ulyssesyou@apache.org>
1 parent dfd9f94 commit a533b2f

File tree

12 files changed

+18
-17
lines changed

12 files changed

+18
-17
lines changed

.github/workflows/license.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
distribution: zulu
3939
java-version: 8
40-
- run: build/mvn org.apache.rat:apache-rat-plugin:check -Ptpcds -Pspark-block-cleaner -Pkubernetes -Pspark-3.1 -Pspark-3.2
40+
- run: build/mvn org.apache.rat:apache-rat-plugin:check -Ptpcds -Pspark-block-cleaner -Pkubernetes-deployment-it -Pspark-3.1 -Pspark-3.2
4141
- name: Upload rat report
4242
if: failure()
4343
uses: actions/upload-artifact@v2

.github/workflows/master.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,14 @@ jobs:
172172
kubectl create serviceaccount kyuubi
173173
kubectl get serviceaccount
174174
- name: start kyuubi
175-
run: kubectl apply -f kubernetes/integration-tests/test-k8s.yaml
175+
run: kubectl apply -f integration-tests/kyuubi-kubernetes-deployment-it/test-k8s.yaml
176176
- name: kyuubi pod check
177177
run: kubectl get pods
178178
- name: integration tests
179179
run: >-
180180
./build/mvn clean install -Dmaven.javadoc.skip=true -Drat.skip=true -Dscalastyle.skip=true -Dspotless.check.skip -V
181-
-pl kubernetes/integration-tests -am
182-
-Pkubernetes
181+
-pl integration-tests/kyuubi-kubernetes-deployment-it -am
182+
-Pkubernetes-deployment-it
183183
-Dtest=none -DwildcardSuites=org.apache.kyuubi.kubernetes.test
184184
- name: Upload test logs
185185
if: failure()

.github/workflows/style.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
strategy:
3434
matrix:
3535
profiles:
36-
- '-Ptpcds -Pspark-block-cleaner -Pkubernetes -Pspark-3.1 -Pspark-3.2'
36+
- '-Ptpcds -Pspark-block-cleaner -Pkubernetes-deployment-it -Pspark-3.1 -Pspark-3.2'
3737
steps:
3838
- uses: actions/checkout@v2.3.5
3939
- name: Setup JDK 8

integration-tests/kyuubi-flink-it/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<modelVersion>4.0.0</modelVersion>
2929

3030
<artifactId>kyuubi-flink-it_2.12</artifactId>
31-
<name>Kyuubi Project IT Flink SQL</name>
31+
<name>Kyuubi Test Flink SQL IT</name>
3232

3333
<dependencies>
3434

kubernetes/integration-tests/pom.xml renamed to integration-tests/kyuubi-kubernetes-deployment-it/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2222
<parent>
2323
<groupId>org.apache.kyuubi</groupId>
24-
<artifactId>kyuubi-parent</artifactId>
24+
<artifactId>integration-tests</artifactId>
2525
<version>1.5.0-SNAPSHOT</version>
26-
<relativePath>../../pom.xml</relativePath>
26+
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>kubernetes-integration-tests_2.12</artifactId>
30-
<name>Kyuubi Kubernetes Integration Tests</name>
29+
<artifactId>kubernetes-deployment-integration-tests_2.12</artifactId>
30+
<name>Kyuubi Test Kubernetes Deployment IT</name>
3131
<modelVersion>4.0.0</modelVersion>
3232

3333
<dependencies>

0 commit comments

Comments
 (0)