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

CORCI-261: build: Global product versioning (#7) #1017

Merged
merged 1 commit into from
Sep 10, 2019
Merged

Conversation

brianjmurrell
Copy link
Contributor

Add a VERSION file for all things that want to display a version
to be able to read from.

Add an scons target "release" that takes a RELEASE variable to create
a new release from. This updates:

  • the VERSION file
  • the RPM daos.spec
    and then commits the changes.

Get the version of the libdaos library to import from the VERSION file.

Once a PR with an updated VERSION file lands to master, a GitHub
action will create a release on GitHub which will include creating a
tag on master where the PR was landed.

Signed-off-by: Brian J. Murrell brian.murrell@intel.com

Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

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

Style warning(s) for job https://build.hpdd.intel.com/job/daos-stack/job/daos/job/PR-1017/1/
Please review https://wiki.hpdd.intel.com/display/DC/Coding+Rules

FYI: Errors found in lines not modified in the patch:

SConstruct:97:
(pylint-missing-docstring) Missing function docstring
(pylint-too-many-locals) Too many local variables (31/30)

SConstruct:203:
(pylint-pointless-string-statement) String statement has no effect

src/utils/py/daos_api.py Outdated Show resolved Hide resolved
.github/actions/make_release/entrypoint.sh Outdated Show resolved Hide resolved
.github/actions/make_release/entrypoint.sh Outdated Show resolved Hide resolved
SConstruct Show resolved Hide resolved
SConstruct Outdated Show resolved Hide resolved
SConstruct Show resolved Hide resolved
SConstruct Outdated Show resolved Hide resolved
SConstruct Outdated Show resolved Hide resolved
SConstruct Show resolved Hide resolved
SConstruct Show resolved Hide resolved
@daosbuild1
Copy link
Collaborator

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on CentOS 7 completed with status UNSTABLE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-1017/1/execution/node/173/log

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on SLES 12.3 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-1017/1/execution/node/255/log

@daosbuild1
Copy link
Collaborator

Test stage Build on Leap 42.3 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-1017/1/execution/node/223/log

@daosbuild1
Copy link
Collaborator

Test stage Build on SLES 12.3 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-1017/1/execution/node/225/log

@daosbuild1
Copy link
Collaborator

Test stage Build on Leap 15 with Intel-C completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-1017/1/execution/node/224/log

@daosbuild1
Copy link
Collaborator

Test stage Build on Ubuntu 18.04 with Clang completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-1017/1/execution/node/216/log

@daosbuild1
Copy link
Collaborator

Test stage Build on CentOS 7 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-1017/1/execution/node/283/log

@daosbuild1 daosbuild1 dismissed their stale review August 28, 2019 18:09

Updated patch

Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

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

Style warning(s) for job https://build.hpdd.intel.com/job/daos-stack/job/daos/job/PR-1017/2/
Please review https://wiki.hpdd.intel.com/display/DC/Coding+Rules

FYI: Errors found in lines not modified in the patch:

SConstruct:97:
(pylint-missing-docstring) Missing function docstring
(pylint-too-many-locals) Too many local variables (31/30)

SConstruct:203:
(pylint-pointless-string-statement) String statement has no effect

src/utils/py/daos_api.py Outdated Show resolved Hide resolved
.github/actions/make_release/entrypoint.sh Outdated Show resolved Hide resolved
.github/actions/make_release/entrypoint.sh Outdated Show resolved Hide resolved
SConstruct Show resolved Hide resolved
SConstruct Outdated Show resolved Hide resolved
SConstruct Show resolved Hide resolved
SConstruct Outdated Show resolved Hide resolved
SConstruct Outdated Show resolved Hide resolved
SConstruct Show resolved Hide resolved
SConstruct Show resolved Hide resolved
@daosbuild1
Copy link
Collaborator

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on CentOS 7 completed with status UNSTABLE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-1017/2/execution/node/213/log

@daosbuild1
Copy link
Collaborator

Test stage Build RPM on SLES 12.3 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-1017/2/execution/node/243/log

@daosbuild1 daosbuild1 dismissed their stale review August 28, 2019 18:55

Updated patch

Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

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

Style warning(s) for job https://build.hpdd.intel.com/job/daos-stack/job/daos/job/PR-1017/3/
Please review https://wiki.hpdd.intel.com/display/DC/Coding+Rules

FYI: Errors found in lines not modified in the patch:

SConstruct:96:
(pylint-missing-docstring) Missing function docstring
(pylint-too-many-locals) Too many local variables (31/30)

SConstruct:205:
(pylint-pointless-string-statement) String statement has no effect

src/utils/py/daos_api.py Outdated Show resolved Hide resolved
SConstruct Outdated Show resolved Hide resolved
SConstruct Outdated Show resolved Hide resolved
SConstruct Outdated Show resolved Hide resolved
SConstruct Show resolved Hide resolved
@daosbuild1 daosbuild1 dismissed their stale review August 28, 2019 19:28

Updated patch

Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

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

Style warning(s) for job https://build.hpdd.intel.com/job/daos-stack/job/daos/job/PR-1017/4/
Please review https://wiki.hpdd.intel.com/display/DC/Coding+Rules

FYI: Errors found in lines not modified in the patch:

SConstruct:96:
(pylint-missing-docstring) Missing function docstring
(pylint-too-many-locals) Too many local variables (31/30)

SConstruct:205:
(pylint-pointless-string-statement) String statement has no effect

src/utils/py/daos_api.py Outdated Show resolved Hide resolved
SConstruct Outdated Show resolved Hide resolved
SConstruct Outdated Show resolved Hide resolved
SConstruct Outdated Show resolved Hide resolved
SConstruct Show resolved Hide resolved
@daosbuild1 daosbuild1 dismissed their stale review August 28, 2019 19:49

Updated patch

Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

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

Style warning(s) for job https://build.hpdd.intel.com/job/daos-stack/job/daos/job/PR-1017/5/
Please review https://wiki.hpdd.intel.com/display/DC/Coding+Rules

FYI: Errors found in lines not modified in the patch:

SConstruct:96:
(pylint-missing-docstring) Missing function docstring
(pylint-too-many-locals) Too many local variables (31/30)

SConstruct:210:
(pylint-pointless-string-statement) String statement has no effect

SConstruct Outdated Show resolved Hide resolved
SConstruct Outdated Show resolved Hide resolved
SConstruct Outdated Show resolved Hide resolved
@daosbuild1 daosbuild1 dismissed their stale review August 28, 2019 20:18

Updated patch

Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

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

Style warning(s) for job https://build.hpdd.intel.com/job/daos-stack/job/daos/job/PR-1017/6/
Please review https://wiki.hpdd.intel.com/display/DC/Coding+Rules

FYI: Errors found in lines not modified in the patch:

SConstruct:96:
(pylint-missing-docstring) Missing function docstring
(pylint-too-many-locals) Too many local variables (31/30)

SConstruct:210:
(pylint-pointless-string-statement) String statement has no effect

SConstruct Outdated Show resolved Hide resolved
@daosbuild1 daosbuild1 dismissed their stale review August 29, 2019 01:18

Updated patch

Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

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

Style warning(s) for job https://build.hpdd.intel.com/job/daos-stack/job/daos/job/PR-1017/7/
Please review https://wiki.hpdd.intel.com/display/DC/Coding+Rules

FYI: Errors found in lines not modified in the patch:

SConstruct:96:
(pylint-missing-docstring) Missing function docstring
(pylint-too-many-locals) Too many local variables (31/30)

SConstruct:210:
(pylint-pointless-string-statement) String statement has no effect

SConstruct Outdated Show resolved Hide resolved
@daosbuild1
Copy link
Collaborator

Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

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

Style warning(s) for job https://build.hpdd.intel.com/job/daos-stack/job/daos/job/PR-1017/9/
Please review https://wiki.hpdd.intel.com/display/DC/Coding+Rules

FYI: Errors found in lines not modified in the patch:

SConstruct:96:
(pylint-missing-docstring) Missing function docstring
(pylint-too-many-locals) Too many local variables (31/30)

SConstruct:217:
(pylint-pointless-string-statement) String statement has no effect

SConstruct Outdated
callbacks=MyCallbacks())
except pygit2.GitError:
print("Error pushing branch. Does it exist in GitHub already?\n"
"See https://github.com/{}/daos/branches".format(org_name))
Copy link
Collaborator

Choose a reason for hiding this comment

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

(pylint-bad-continuation) Wrong continued indentation (add 1 space).

@daosbuild1
Copy link
Collaborator

Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

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

Style warning(s) for job https://build.hpdd.intel.com/job/daos-stack/job/daos/job/PR-1017/10/
Please review https://wiki.hpdd.intel.com/display/DC/Coding+Rules

FYI: Errors found in lines not modified in the patch:

SConstruct:96:
(pylint-missing-docstring) Missing function docstring
(pylint-too-many-locals) Too many local variables (31/30)

SConstruct:220:
(pylint-pointless-string-statement) String statement has no effect

SConstruct Outdated
callbacks=MyCallbacks())
except pygit2.GitError:
print("Error pushing branch. Does it exist in GitHub already?\n"
"See https://github.com/{}/daos/branches".format(org_name))
Copy link
Collaborator

Choose a reason for hiding this comment

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

(pylint-bad-continuation) Wrong continued indentation (add 1 space).

SConstruct Show resolved Hide resolved
SConstruct Show resolved Hide resolved
@daosbuild1
Copy link
Collaborator

Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

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

Style warning(s) for job https://build.hpdd.intel.com/job/daos-stack/job/daos/job/PR-1017/11/
Please review https://wiki.hpdd.intel.com/display/DC/Coding+Rules

FYI: Errors found in lines not modified in the patch:

SConstruct:96:
(pylint-missing-docstring) Missing function docstring
(pylint-too-many-locals) Too many local variables (33/30)

SConstruct:236:
(pylint-pointless-string-statement) String statement has no effect

SConstruct Show resolved Hide resolved
SConstruct Show resolved Hide resolved
SConstruct Outdated
'refs/remotes/{}/master'.format(remote_name))
try:
repo.branches.create(branch, repo[master.target])
except pygit2.AlreadyExistsError:
Copy link
Collaborator

Choose a reason for hiding this comment

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

(pylint-no-member) Module 'pygit2' has no 'AlreadyExistsError' member

SConstruct Outdated
repo.branches.create(branch, repo[master.target])
except pygit2.AlreadyExistsError:
print("Branch {} exists in GitHub already\n"
"See https://github.com/{}/daos/branches".format(branch,
Copy link
Collaborator

Choose a reason for hiding this comment

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

(pylint-bad-continuation) Wrong continued indentation (add 1 space).

SConstruct Outdated
callbacks=MyCallbacks())
except pygit2.GitError:
print("Error pushing branch. Does it exist in GitHub already?\n"
"See https://github.com/{}/daos/branches".format(org_name))
Copy link
Collaborator

Choose a reason for hiding this comment

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

(pylint-bad-continuation) Wrong continued indentation (add 1 space).

SConstruct Outdated

print("Self-assigning the PR...")
# self-assign the PR
me = gh_context.get_user(gh_context.get_user().login)
Copy link
Collaborator

Choose a reason for hiding this comment

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

(pylint-invalid-name) Invalid variable name "me"

@daosbuild1
Copy link
Collaborator

Add a VERSION file for all things that want to display a version
to be able to read from.

Add an scons target "release" that takes a RELEASE variable to create
a new release from.  This updates:
- the VERSION file
- the RPM daos.spec
and then commits the changes.

Get the version of the libdaos library to import from the VERSION file.

Once a PR with an updated VERSION file lands to master, a GitHub
action will create a release on GitHub which will include creating a
tag on master where the PR was landed.

Signed-off-by: Brian J. Murrell <brian.murrell@intel.com>
Copy link
Contributor

@jolivier23 jolivier23 left a comment

Choose a reason for hiding this comment

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

seems reasonable, I think. I presume this doesn't generate any new files that would need to be cleaned?

@brianjmurrell
Copy link
Contributor Author

seems reasonable, I think.

😄

I presume this doesn't generate any new files that would need to be cleaned?

The only new file created is the VERSION file and that gets committed to git in the process.

@brianjmurrell brianjmurrell requested a review from a team September 10, 2019 17:41
@jolivier23 jolivier23 merged commit 055a30f into master Sep 10, 2019
@jolivier23 jolivier23 deleted the create_release branch September 10, 2019 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants