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

Fix nightly scripts to deploy w/ classifier correctly [skip ci] #5287

Merged
merged 2 commits into from
Apr 20, 2022
Merged

Fix nightly scripts to deploy w/ classifier correctly [skip ci] #5287

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26eb522
fix nightly script deployment w/ classifier
pxLi Apr 20, 2022
b854336
address comments
pxLi Apr 20, 2022
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
3 changes: 2 additions & 1 deletion jenkins/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ $DEPLOY_CMD -Durl=$SERVER_URL -DrepositoryId=$SERVER_ID \
# Distribution jar is a shaded artifact so use the reduced dependency pom.
$DEPLOY_CMD -Durl=$SERVER_URL -DrepositoryId=$SERVER_ID \
$SRC_DOC_JARS \
-Dfile=$FPATH.jar -DgroupId=com.nvidia -DartifactId=$ART_ID -Dversion=$ART_VER \
NvTimLiu marked this conversation as resolved.
Show resolved Hide resolved
-Dfile=$FPATH.jar -Dtypes=jar -Dfiles=$FPATH.jar \
-DgroupId=com.nvidia -DartifactId=$ART_ID -Dversion=$ART_VER \
-DpomFile="$POM_FPATH" -Dclassifiers=$CUDA_CLASSIFIER

###### Deploy profiling tool jar(s) ######
Expand Down
6 changes: 3 additions & 3 deletions jenkins/spark-nightly-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ART_ID=$(mvnEval project.artifactId)
ART_GROUP_ID=$(mvnEval project.groupId)
ART_VER=$(mvnEval project.version)

DIST_FPATH="$DIST_PL/target/$ART_ID-$ART_VER-$CUDA_CLASSIFIER"
DIST_FPATH="$DIST_PL/target/$ART_ID-$ART_VER"
DIST_POM_FPATH="$DIST_PL/target/extra-resources/META-INF/maven/$ART_GROUP_ID/$ART_ID/pom.xml"

DIST_PROFILE_OPT=-Dincluded_buildvers=$(IFS=,; echo "${SPARK_SHIM_VERSIONS[*]}")
Expand All @@ -55,7 +55,7 @@ function distWithReducedPom {

deploy)
mvnCmd="deploy:deploy-file"
mvnExtaFlags="-Durl=${URM_URL}-local -DrepositoryId=snapshots"
mvnExtaFlags="-Durl=${URM_URL}-local -DrepositoryId=snapshots -Dtypes=jar -Dfiles=${DIST_FPATH}.jar -Dclassifiers=$CUDA_CLASSIFIER"
;;

*)
Expand All @@ -71,7 +71,6 @@ function distWithReducedPom {
-DgroupId="${ART_GROUP_ID}" \
-DartifactId="${ART_ID}" \
-Dversion="${ART_VER}" \
-Dclassifiers=$CUDA_CLASSIFIER \
$mvnExtaFlags
}

Expand Down Expand Up @@ -114,6 +113,7 @@ mvn -B clean install -pl '!tools' \
distWithReducedPom "install"

if [[ $SKIP_DEPLOY != 'true' ]]; then
DIST_FPATH="$DIST_FPATH-$CUDA_CLASSIFIER"
distWithReducedPom "deploy"

# this deploy includes 'tools' that is unconditionally built with Spark 3.1.1
Expand Down