Skip to content

Commit

Permalink
[KYUUBI #1738] Unify kubernetes integration test
Browse files Browse the repository at this point in the history
<!--
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>
  • Loading branch information
ulysses-you committed Jan 13, 2022
1 parent dfd9f94 commit a533b2f
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/license.yml
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/master.yml
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/style.yml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/kyuubi-flink-it/pom.xml
Expand Up @@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>

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

<dependencies>

Expand Down
Expand Up @@ -21,13 +21,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-parent</artifactId>
<artifactId>integration-tests</artifactId>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

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

<dependencies>
Expand Down
File renamed without changes.
8 changes: 8 additions & 0 deletions integration-tests/pom.xml
Expand Up @@ -35,4 +35,12 @@
<module>kyuubi-flink-it</module>
</modules>

<profiles>
<profile>
<id>kubernetes-deployment-it</id>
<modules>
<module>kyuubi-kubernetes-deployment-it</module>
</modules>
</profile>
</profiles>
</project>
7 changes: 0 additions & 7 deletions pom.xml
Expand Up @@ -1799,13 +1799,6 @@
</modules>
</profile>

<profile>
<id>kubernetes</id>
<modules>
<module>kubernetes/integration-tests</module>
</modules>
</profile>

<profile>
<id>apache-release</id>
<build>
Expand Down

0 comments on commit a533b2f

Please sign in to comment.