Skip to content

Comments

[SPARK-30816][K8S][TESTS] Fix dev-run-integration-tests.sh to ignore empty params#27566

Closed
dongjoon-hyun wants to merge 1 commit intoapache:masterfrom
dongjoon-hyun:SPARK-30816
Closed

[SPARK-30816][K8S][TESTS] Fix dev-run-integration-tests.sh to ignore empty params#27566
dongjoon-hyun wants to merge 1 commit intoapache:masterfrom
dongjoon-hyun:SPARK-30816

Conversation

@dongjoon-hyun
Copy link
Member

@dongjoon-hyun dongjoon-hyun commented Feb 13, 2020

What changes were proposed in this pull request?

This PR aims to fix dev-run-integration-tests.sh to ignore empty params correctly.

Why are the changes needed?

The following script runs mvn integration test like the following.

$ resource-managers/kubernetes/integration-tests/dev/dev-run-integration-tests.sh
...
build/mvn integration-test 
-f /Users/dongjoon/APACHE/spark/pom.xml 
-pl resource-managers/kubernetes/integration-tests 
-am
-Pscala-2.12
-Pkubernetes
-Pkubernetes-integration-tests 
-Djava.version=8 
-Dspark.kubernetes.test.sparkTgz=N/A 
-Dspark.kubernetes.test.imageTag=N/A 
-Dspark.kubernetes.test.imageRepo=docker.io/kubespark 
-Dspark.kubernetes.test.deployMode=minikube 
-Dtest.include.tags=k8s 
-Dspark.kubernetes.test.namespace= 
-Dspark.kubernetes.test.serviceAccountName= 
-Dspark.kubernetes.test.kubeConfigContext= 
-Dspark.kubernetes.test.master= 
-Dtest.exclude.tags= 
-Dspark.kubernetes.test.jvmImage=spark 
-Dspark.kubernetes.test.pythonImage=spark-py 
-Dspark.kubernetes.test.rImage=spark-r

After this PR, the empty parameters like the followings will be skipped like the original design.

-Dspark.kubernetes.test.namespace= 
-Dspark.kubernetes.test.serviceAccountName= 
-Dspark.kubernetes.test.kubeConfigContext= 
-Dspark.kubernetes.test.master= 
-Dtest.exclude.tags= 

Does this PR introduce any user-facing change?

No.

How was this patch tested?

Pass the Jenkins K8S integration test.

@dongjoon-hyun
Copy link
Member Author

Hi, @liyinan926 . Could you review this, please?

Copy link
Contributor

@liyinan926 liyinan926 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks!

@dongjoon-hyun
Copy link
Member Author

Thank you for review, @liyinan926 . I'll rebase in order to resolve the conflicts.

@SparkQA
Copy link

SparkQA commented Feb 13, 2020

Test build #118376 has finished for PR 27566 at commit 21125e5.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Feb 13, 2020

Test build #118377 has finished for PR 27566 at commit 069c203.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@dongjoon-hyun
Copy link
Member Author

Merged to master/3.0.

dongjoon-hyun added a commit that referenced this pull request Feb 13, 2020
…empty params

### What changes were proposed in this pull request?

This PR aims to fix `dev-run-integration-tests.sh` to ignore empty params correctly.

### Why are the changes needed?

The following script runs `mvn` integration test like the following.
```
$ resource-managers/kubernetes/integration-tests/dev/dev-run-integration-tests.sh
...
build/mvn integration-test
-f /Users/dongjoon/APACHE/spark/pom.xml
-pl resource-managers/kubernetes/integration-tests
-am
-Pscala-2.12
-Pkubernetes
-Pkubernetes-integration-tests
-Djava.version=8
-Dspark.kubernetes.test.sparkTgz=N/A
-Dspark.kubernetes.test.imageTag=N/A
-Dspark.kubernetes.test.imageRepo=docker.io/kubespark
-Dspark.kubernetes.test.deployMode=minikube
-Dtest.include.tags=k8s
-Dspark.kubernetes.test.namespace=
-Dspark.kubernetes.test.serviceAccountName=
-Dspark.kubernetes.test.kubeConfigContext=
-Dspark.kubernetes.test.master=
-Dtest.exclude.tags=
-Dspark.kubernetes.test.jvmImage=spark
-Dspark.kubernetes.test.pythonImage=spark-py
-Dspark.kubernetes.test.rImage=spark-r
```

After this PR, the empty parameters like the followings will be skipped like the original design.
```
-Dspark.kubernetes.test.namespace=
-Dspark.kubernetes.test.serviceAccountName=
-Dspark.kubernetes.test.kubeConfigContext=
-Dspark.kubernetes.test.master=
-Dtest.exclude.tags=
```

### Does this PR introduce any user-facing change?

No.

### How was this patch tested?

Pass the Jenkins K8S integration test.

Closes #27566 from dongjoon-hyun/SPARK-30816.

Authored-by: Dongjoon Hyun <dhyun@apple.com>
Signed-off-by: Dongjoon Hyun <dhyun@apple.com>
(cherry picked from commit 74cd46e)
Signed-off-by: Dongjoon Hyun <dhyun@apple.com>
@SparkQA
Copy link

SparkQA commented Feb 13, 2020

Kubernetes integration test starting
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/23133/

@dongjoon-hyun dongjoon-hyun deleted the SPARK-30816 branch February 13, 2020 19:57
@SparkQA
Copy link

SparkQA commented Feb 13, 2020

Kubernetes integration test starting
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/23134/

@SparkQA
Copy link

SparkQA commented Feb 13, 2020

Kubernetes integration test status failure
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/23133/

@SparkQA
Copy link

SparkQA commented Feb 13, 2020

Kubernetes integration test status failure
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/23134/

sjincho pushed a commit to sjincho/spark that referenced this pull request Apr 15, 2020
…empty params

### What changes were proposed in this pull request?

This PR aims to fix `dev-run-integration-tests.sh` to ignore empty params correctly.

### Why are the changes needed?

The following script runs `mvn` integration test like the following.
```
$ resource-managers/kubernetes/integration-tests/dev/dev-run-integration-tests.sh
...
build/mvn integration-test
-f /Users/dongjoon/APACHE/spark/pom.xml
-pl resource-managers/kubernetes/integration-tests
-am
-Pscala-2.12
-Pkubernetes
-Pkubernetes-integration-tests
-Djava.version=8
-Dspark.kubernetes.test.sparkTgz=N/A
-Dspark.kubernetes.test.imageTag=N/A
-Dspark.kubernetes.test.imageRepo=docker.io/kubespark
-Dspark.kubernetes.test.deployMode=minikube
-Dtest.include.tags=k8s
-Dspark.kubernetes.test.namespace=
-Dspark.kubernetes.test.serviceAccountName=
-Dspark.kubernetes.test.kubeConfigContext=
-Dspark.kubernetes.test.master=
-Dtest.exclude.tags=
-Dspark.kubernetes.test.jvmImage=spark
-Dspark.kubernetes.test.pythonImage=spark-py
-Dspark.kubernetes.test.rImage=spark-r
```

After this PR, the empty parameters like the followings will be skipped like the original design.
```
-Dspark.kubernetes.test.namespace=
-Dspark.kubernetes.test.serviceAccountName=
-Dspark.kubernetes.test.kubeConfigContext=
-Dspark.kubernetes.test.master=
-Dtest.exclude.tags=
```

### Does this PR introduce any user-facing change?

No.

### How was this patch tested?

Pass the Jenkins K8S integration test.

Closes apache#27566 from dongjoon-hyun/SPARK-30816.

Authored-by: Dongjoon Hyun <dhyun@apple.com>
Signed-off-by: Dongjoon Hyun <dhyun@apple.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants