Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge qa test to integration test #172

Merged
merged 3 commits into from
Jun 16, 2020
Merged

Merge qa test to integration test #172

merged 3 commits into from
Jun 16, 2020

Conversation

shotai
Copy link
Contributor

@shotai shotai commented Jun 15, 2020

This PR is for merging QA test into our integration test folder.
Test SQLs are from QA's test cases

All tests have the "qarun" marker. Can be disselected by adding -m 'not qarun' to command line options.

Update run script to disselect these tests by default

@shotai shotai changed the title [WIP]Merge qa test to integration test Merge qa test to integration test Jun 15, 2020
@revans2
Copy link
Collaborator

revans2 commented Jun 15, 2020

build

@revans2
Copy link
Collaborator

revans2 commented Jun 15, 2020

The build failed with an error of

07:31:18  ERROR: file not found: qarun'

My guess is that there is something wrong with the shell script. I am happy to try and help debug it if you want.

@shotai
Copy link
Contributor Author

shotai commented Jun 15, 2020

Sure, please help. Let me know which part need to change. My thought is the "not qarun" passed to the pytest.main as 2 arguments, so qarun become the file name, not part of expression.

@revans2
Copy link
Collaborator

revans2 commented Jun 15, 2020

I would suggest you apply the following patch. It makes it so the qa tests don't run on a normal developer build, but they run on the pre-merge build, where if it takes a longer time it is less important. It also allows developers to select tests through a maven command line option.

diff --git a/integration_tests/pom.xml b/integration_tests/pom.xml
index c40e47a5..365a32f9 100644
--- a/integration_tests/pom.xml
+++ b/integration_tests/pom.xml
@@ -152,6 +152,7 @@
                                 <SKIP_TESTS>${skipTests}</SKIP_TESTS>
                                 <TEST>${test}</TEST>
                                 <COVERAGE_SUBMIT_FLAGS>${argLine}</COVERAGE_SUBMIT_FLAGS>
+                                <TEST_TAGS>${pytest.TEST_TAGS}</TEST_TAGS>
                             </environmentVariables>
                         </configuration>
                     </execution>
diff --git a/integration_tests/run_pyspark_from_build.sh b/integration_tests/run_pyspark_from_build.sh
index a3c71140..bdd1e636 100755
--- a/integration_tests/run_pyspark_from_build.sh
+++ b/integration_tests/run_pyspark_from_build.sh
@@ -31,5 +31,9 @@ else
     then
         TEST_ARGS="-k $TEST"
     fi
-    "$SPARK_HOME"/bin/spark-submit --jars "${ALL_JARS// /,}" --conf "spark.driver.extraJavaOptions=-Duser.timezone=GMT $COVERAGE_SUBMIT_FLAGS" --conf 'spark.executor.extraJavaOptions=-Duser.timezone=GMT' --conf 'spark.sql.session.timeZone=UTC' --conf 'spark.sql.shuffle.partitions=12' $SPARK_SUBMIT_FLAGS ./runtests.py -v -rfExXs -m \'not qarun\' --std_input_path=./src/test/resources/ "$TEST_ARGS" $RUN_TEST_PARAMS "$@"
+    if [[ "${TEST_TAGS}" != "" ]];
+    then
+        TEST_TAGS="-m $TEST_TAGS"
+    fi
+    "$SPARK_HOME"/bin/spark-submit --jars "${ALL_JARS// /,}" --conf "spark.driver.extraJavaOptions=-Duser.timezone=GMT $COVERAGE_SUBMIT_FLAGS" --conf 'spark.executor.extraJavaOptions=-Duser.timezone=GMT' --conf 'spark.sql.session.timeZone=UTC' --conf 'spark.sql.shuffle.partitions=12' $SPARK_SUBMIT_FLAGS ./runtests.py -v -rfExXs "$TEST_TAGS" --std_input_path=./src/test/resources/ "$TEST_ARGS" $RUN_TEST_PARAMS "$@"
 fi
diff --git a/jenkins/spark-premerge-build.sh b/jenkins/spark-premerge-build.sh
index bca4ce1f..fa69c2d5 100755
--- a/jenkins/spark-premerge-build.sh
+++ b/jenkins/spark-premerge-build.sh
@@ -49,7 +49,7 @@ export PATH="$SPARK_HOME/bin:$SPARK_HOME/sbin:$PATH"
 tar zxf $SPARK_HOME.tar.gz -C $ARTF_ROOT && \
     rm -f $SPARK_HOME.tar.gz
 
-mvn -U -B "$@" clean verify
+mvn -U -B "$@" clean verify -Dpytest.TEST_TAGS=''
 
 # The jacoco coverage should have been collected, but because of how the shade plugin
 # works and jacoco we need to clean some things up so jacoco will only report for the
diff --git a/pom.xml b/pom.xml
index 30402690..5555ea94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,7 @@
         <rapids.shuffle.manager.override>false</rapids.shuffle.manager.override>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.sourceEncoding>UTF-8</project.reporting.sourceEncoding>
+        <pytest.TEST_TAGS>not qarun</pytest.TEST_TAGS>
     </properties>
 
     <dependencyManagement>

@sameerz sameerz added the test Only impacts tests label Jun 15, 2020
@shotai
Copy link
Contributor Author

shotai commented Jun 16, 2020

I've update with the patch above. Thanks

@revans2
Copy link
Collaborator

revans2 commented Jun 16, 2020

build

@revans2 revans2 merged commit 9461c8e into NVIDIA:branch-0.1 Jun 16, 2020
@sameerz sameerz added this to the Jun 8 - Jun 19 milestone Jun 16, 2020
nartal1 pushed a commit to nartal1/spark-rapids that referenced this pull request Jun 9, 2021
* merge qa test to integration test

* add run control for qa test and update sql

* Update build script for qatest
nartal1 pushed a commit to nartal1/spark-rapids that referenced this pull request Jun 9, 2021
* merge qa test to integration test

* add run control for qa test and update sql

* Update build script for qatest
tgravescs pushed a commit to tgravescs/spark-rapids that referenced this pull request Nov 30, 2023
* Exclude cuFIleTest during build

Signed-off-by: Peixin Li <pxli@nyu.edu>

* Exclude cuFIleTest during build

Signed-off-by: Peixin Li <pxli@nyu.edu>

* exclude cufiletest in cudfjni build

* update deploy script to reflect module naming change

* deploy pom

* fix test run
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
test Only impacts tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants