Update Databricks build scripts [databricks] #5588
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1, Change unused Databricks build parameter `build_profiles` to `mvn_opt`, will re-use mvn_opt as maven options, e.g. mvn_opt='-Dspark-rapids-jnv.version=22.06.0-SNAPSHOT' 2, There would be parameters mismatching issue for the script build.sh, if empty parameters are used, or if one of the parameters are missing. e.g. "build.sh param1 'blankspace' param3 would be treat as "build.sh param1 param2" To avoid this mismatching, pass parameters through shell environment for the script file build.sh instead, e.g., SPARK_VER=3.1.2 MVN_OPT=' ' SOURCE_FILE=spark-rapids.tgz bash build.sh 3, remove unused `build_profiles` parameter from Jenkinsfile-blossom.premerge Signed-off-by: Tim Liu <timl@nvidia.com>
NvTimLiu
commented
May 23, 2022
| @@ -38,7 +38,10 @@ def main(): | |||
| print("rsync command: %s" % rsync_command) | |||
| subprocess.check_call(rsync_command, shell = True) | |||
|
|
|||
| ssh_command = "bash -c 'ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ubuntu@%s -p 2200 -i %s %s %s %s %s %s 2>&1 | tee buildout; if [ `echo ${PIPESTATUS[0]}` -ne 0 ]; then false; else true; fi'" % (master_addr, params.private_key_file, params.script_dest, params.tgz_dest, params.base_spark_pom_version, params.base_spark_version_to_install_databricks_jars, params.build_profiles) | |||
| ssh_command = "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ubuntu@%s -p 2200 -i %s " \ | |||
There was a problem hiding this comment.
To avoid this mismatching, pass parameters through shell environment for the script file build.sh instead, e.g.,
SPARK_VER=3.1.2 MVN_OPT=' ' SOURCE_FILE=spark-rapids.tgz bash build.sh
|
build |
tgravescs
reviewed
May 23, 2022
| '3.0.1' | ||
| ], | ||
| '9.1': [ | ||
| '9.1.x-gpu-ml-scala2.12', | ||
| '3.1.2', | ||
| 'init_cudf_udf.sh', | ||
| 'databricks312,!snapshot-shims', | ||
| '3.1.2' | ||
| ], | ||
| '10.4': [ |
There was a problem hiding this comment.
I assume the below databricks321,!snapshot-shims should be removed
There was a problem hiding this comment.
Oh yes, my fault, this changed of the line 321 was wrongly revoked in my local branch. Fixed
|
build |
jenkins/databricks/params.py
Outdated
| @@ -89,7 +90,7 @@ def usage(): | |||
| elif opt in ('-v', '--basesparkpomversion'): | |||
| base_spark_pom_version = arg | |||
| elif opt in ('-b', '--bulidprofiles'): | |||
There was a problem hiding this comment.
Should we change --bulidprofiles to --mvnoptions?
|
build |
tgravescs
approved these changes
May 24, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To fix #5535
1, Change unused Databricks build parameter
build_profilestomvn_opt, will re-use mvn_opt as maven options, e.g. mvn_opt='-Dspark-rapids-jnv.version=22.06.0-SNAPSHOT'2, There would be parameters mismatching issue for the script build.sh, if empty parameters are used, or if one of the parameters are missing. e.g. "build.sh param1 'blankspace' param3 would be treat as "build.sh param1 param2"
To avoid this mismatching, pass parameters through shell environment for the script file build.sh instead, e.g.,
SPARK_VER=3.1.2 MVN_OPT=' ' SOURCE_FILE=spark-rapids.tgz bash build.sh
3, remove unused
build_profilesparameter from Jenkinsfile-blossom.premergeSigned-off-by: Tim Liu timl@nvidia.com