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

Added in profile to enable shims for SNAPSHOT releases #611

Merged
merged 4 commits into from
Aug 26, 2020

Conversation

revans2
Copy link
Collaborator

@revans2 revans2 commented Aug 25, 2020

This fixes #602

I didn't update any of the Jenkins files because they either already use a profile for databricks that would disable the snapshot-shims profile or they have it enabled by default. I could update the premerge to try and have this off by default, but I would need to add a second one that has it enabled too, so we know if we are missing something.

Signed-off-by: Robert (Bobby) Evans <bobby@apache.org>
@revans2
Copy link
Collaborator Author

revans2 commented Aug 25, 2020

build

@tgravescs
Copy link
Collaborator

so to clarify, this is active by default but if you specify another profile it disables this one? I would think we want this profile specified for everything except the release build.

@sameerz sameerz added the build Related to CI / CD or cleanly building label Aug 25, 2020
@sameerz sameerz added this to the Aug 17 - Aug 28 milestone Aug 25, 2020
@jlowe
Copy link
Member

jlowe commented Aug 26, 2020

so to clarify, this is active by default but if you specify another profile it disables this one?

Yes, specifying any other profile explicitly on the command-line will disable the snapshot-shims profile.

I would think we want this profile specified for everything except the release build.

The problem with that setup is we would never be regularly testing what we're planning to ship.

From a cursory glance, it appears the premerge CI is specifying some profiles which would turn this off (mirror-apache-to-urm, include-databricks). Rather than the implicit behavior, we may want to make an explicit profile, either to include or exclude, so we don't get some surprising behaviors when someone activates a separate profile that has nothing to do with shims.

Also how would this interact with the spark*tests profiles? If someone specifies the spark301tests profile, will it turn off the snapshot shims and then fail the tests against 3.0.1-SNAPSHOT because it cannot find the shim?

@revans2
Copy link
Collaborator Author

revans2 commented Aug 26, 2020

I agree that we should probably be specific about all of the profiles for the builds.

I missed the $MVN_URM_MIRROR having a profile in it too, so I'll try to make it clearer what is happening there.

Also how would this interact with the spark*tests profiles?

From my experience with maven there is no way to have one profile activate/deactivate another profile. We could, however, have a property that activates multiple profiles. So they would both be independent of each other.

@jlowe
Copy link
Member

jlowe commented Aug 26, 2020

We could, however, have a property that activates multiple profiles

+1 for this. That way we can ask for spark versions to test against with property settings, and those will enable both the test profile for a spark version along with the shim if that shim version happens to be a snapshot.

@revans2
Copy link
Collaborator Author

revans2 commented Aug 26, 2020

I would have to do some testing to see if we can make it work mixing properties and explicit setting of profiles.

@revans2
Copy link
Collaborator Author

revans2 commented Aug 26, 2020

build

jlowe
jlowe previously approved these changes Aug 26, 2020
Copy link
Member

@jlowe jlowe left a comment

Choose a reason for hiding this comment

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

Looks good to me, would be good to hear from @tgravescs.

@@ -19,11 +19,11 @@ set -ex

. jenkins/version-def.sh

mvn -U -B -Pinclude-databricks clean deploy $MVN_URM_MIRROR -Dmaven.repo.local=$WORKSPACE/.m2
mvn -U -B '-Pinclude-databricks,!snapshot-shims' clean deploy $MVN_URM_MIRROR -Dmaven.repo.local=$WORKSPACE/.m2
Copy link
Collaborator

Choose a reason for hiding this comment

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

this will deploy the nightly version without the snapshot shims to urm. Which means devs and integration tests can't use it. Our integration test builds rely on this now.

@tgravescs
Copy link
Collaborator

if we want to keep integration testing nightly what we actually push, then we would need 2 separate jars - one with shims and one without, otherwise we aren't integration testing the shims which I think is a bad idea.

otherwise we push the version with all the shims and then just test the one without shims differently. This doesn't seem high risk to me to have to test it on every premerge, I would rather just test nightly or something before a release.

@revans2
Copy link
Collaborator Author

revans2 commented Aug 26, 2020

build

@revans2
Copy link
Collaborator Author

revans2 commented Aug 26, 2020

@tgravescs I addressed your comments on the nightly deploy.

@jlowe jlowe merged commit b7ad292 into NVIDIA:branch-0.2 Aug 26, 2020
@revans2 revans2 deleted the NO_SNAPSHOT_RELEASE branch August 27, 2020 13:05
nartal1 pushed a commit to nartal1/spark-rapids that referenced this pull request Jun 9, 2021
* Added in profile to enable shims for SNAPSHOT releases

Signed-off-by: Robert (Bobby) Evans <bobby@apache.org>

* Updated jenkins files to be explicit about snapshot-shims

* Addressed review comments
nartal1 pushed a commit to nartal1/spark-rapids that referenced this pull request Jun 9, 2021
* Added in profile to enable shims for SNAPSHOT releases

Signed-off-by: Robert (Bobby) Evans <bobby@apache.org>

* Updated jenkins files to be explicit about snapshot-shims

* Addressed review comments
tgravescs pushed a commit to tgravescs/spark-rapids that referenced this pull request Nov 30, 2023
…VIDIA#611)

* fixing incorrect invalidation of positive cudf scale decimal values

* signoff

Signed-off-by: Mike Wilson <knobby@burntsheep.com>

* typo fix

Signed-off-by: Mike Wilson <knobby@burntsheep.com>

* Update src/main/cpp/src/cast_string.cu

Co-authored-by: Nghia Truong <nghiatruong.vn@gmail.com>

Signed-off-by: Mike Wilson <knobby@burntsheep.com>
Co-authored-by: Nghia Truong <nghiatruong.vn@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Related to CI / CD or cleanly building
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FEA] don't release with any -SNAPSHOT dependencies
4 participants