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

[SW-1681] Change sw version to include also patch within one h2o version #1585

Merged
merged 7 commits into from Nov 4, 2019

Conversation

jakubhava
Copy link
Contributor

@jakubhava jakubhava commented Oct 31, 2019

Versions will be:

Normal: 3.26.0.9-1-2.4
where 3.26.0.9 is H2O version, -1 is iteration within the single h2o version and -2.4 is spark version.

For nightlies, the format is: 3.26.0.9-1.1-2.4, where almost everything is same as ^ except the 1.1 represents the iteration and the nightly build number after the dot.

@jakubhava jakubhava force-pushed the jh/sw-1681 branch 2 times, most recently from 1a8e293 to aff04e9 Compare November 1, 2019 08:36
@jakubhava jakubhava added next major release Goes into Major release and removed work in progress WIP labels Nov 1, 2019
@jakubhava
Copy link
Contributor Author

Manually tested release pipeline and nightly builds

@jakubhava
Copy link
Contributor Author

@mn-mikke also update confluence page with release steps. There is now new checkbox when releasing sw, by default selected which is used to tell the build whether this release contain upgrade of H2O or not. It internally determines whether to upgrade minor version ( 3.26.0.1-1 -> 2.26.0.2-1) or whether to upgrade the sw patch version ( 3.26.0.1-1 -> 3.26.0.1-2)

@jakubhava jakubhava force-pushed the jh/sw-1681 branch 2 times, most recently from be76747 to a91fd9d Compare November 1, 2019 09:26
doc/src/site/sphinx/migration_guide.rst Outdated Show resolved Hide resolved
doc/src/site/sphinx/migration_guide.rst Outdated Show resolved Hide resolved
doc/src/site/sphinx/migration_guide.rst Outdated Show resolved Hide resolved
doc/src/site/sphinx/migration_guide.rst Outdated Show resolved Hide resolved
jenkins/sparklingWaterPipeline.groovy Outdated Show resolved Hide resolved
jenkins/sparklingWaterPipeline.groovy Outdated Show resolved Hide resolved
jenkins/sparklingWaterPipeline.groovy Outdated Show resolved Hide resolved
jenkins/sparklingWaterPipeline.groovy Outdated Show resolved Hide resolved
py/build.gradle Outdated Show resolved Hide resolved
@jakubhava
Copy link
Contributor Author

Thank you @mn-mikke for really good catches, I applied fixes based on your review

@jakubhava
Copy link
Contributor Author

@mn-mikke please have a look if all looks good

Copy link
Collaborator

@mn-mikke mn-mikke left a comment

Choose a reason for hiding this comment

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

LGTM

def h2oPart = versionParts[0]
def swPatch = versionParts[1]
def swNightlyBuildNumber
try {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is the following piece of code going to work with the old scheme once you merge it master?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Master will be using the new scheme after we merge this. rel-3.26 will be the last one to use the old scheme

@jakubhava jakubhava merged commit 562c71f into master Nov 4, 2019
@jakubhava jakubhava deleted the jh/sw-1681 branch November 4, 2019 09:56
jakubhava added a commit that referenced this pull request Nov 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
next major release Goes into Major release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants