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.

Sign up for GitHub

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

Jump to bottom

Update premerge to use the combined snapshots jar #3801

Merged
merged 2 commits into from
Oct 13, 2021
Merged

Update premerge to use the combined snapshots jar #3801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c1ec60
disable Jacoco and have premerge use snapshots jar
tgravescs Oct 11, 2021
8e1f7c6
signoff
tgravescs Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions jenkins/Jenkinsfile-blossom.premerge
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,18 +315,6 @@ pipeline {
container('gpu') {
timeout(time: 4, unit: 'HOURS') { // step only timeout for test run
sh "$PREMERGE_SCRIPT mvn_verify"
step([$class : 'JacocoPublisher',
execPattern : '**/target/jacoco.exec',
classPattern : 'target/jacoco_classes/',
sourceInclusionPattern: '**/*.java,**/*.scala',
sourcePattern : 'shuffle-plugin/src/main/scala/,' +
'udf-compiler/src/main/scala/,sql-plugin/src/main/java/,' +
'sql-plugin/src/main/scala/,shims/spark311/src/main/scala/,' +
'shims/spark301db/src/main/scala/,shims/spark301/src/main/scala/,' +
'shims/spark302/src/main/scala/,shims/spark303/src/main/scala/,' +
'shims/spark304/src/main/scala/,shims/spark312/src/main/scala/,' +
'shims/spark313/src/main/scala/'
])
}
}
}
Expand Down
12 changes: 1 addition & 11 deletions jenkins/spark-premerge-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,9 @@ mvn_verify() {

# Here run Python integration tests tagged with 'premerge_ci_1' only, that would help balance test duration and memory
# consumption from two k8s pods running in parallel, which executes 'mvn_verify()' and 'ci_2()' respectively.
mvn -U -B $MVN_URM_MIRROR '-Pindividual,pre-merge' clean verify -Dpytest.TEST_TAGS="premerge_ci_1" \
mvn -U -B $MVN_URM_MIRROR '-Psnapshots,pre-merge' clean verify -Dpytest.TEST_TAGS="premerge_ci_1" \
-Dpytest.TEST_TYPE="pre-commit" -Dpytest.TEST_PARALLEL=4 -Dcuda.version=$CUDA_CLASSIFIER

# 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
# things we care about
mkdir -p target/jacoco_classes/
FILE=$(ls dist/target/rapids-4-spark_2.12-*.jar | grep -v test | xargs readlink -f)
pushd target/jacoco_classes/
jar xf $FILE
rm -rf com/nvidia/shaded/ org/openucx/
popd

# Triggering here until we change the jenkins file
rapids_shuffle_smoke_test
}
Expand Down