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

Ensure RPMs are only build from clean git trees #13000

Merged

Conversation

stevekuznetsov
Copy link
Contributor

The tito process for building RPMs will not incorporate any changes
that are not committed in the git tree, so if we notice that the git
three state is dirty during the RPM build, we should fail early and
ask the user to commit their changes first before re-trying the build.

Signed-off-by: Steve Kuznetsov [email protected]

/cc @smarterclayton
[test]

@@ -18,6 +18,9 @@ fi

os::log::info 'Building Origin release RPMs with tito...'
os::build::get_version_vars
if [[ "${OS_GIT_TREE_STATE}" == "drity" ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

Heh, typo.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

:(

The `tito` process for building RPMs will not incorporate any changes
that are not committed in the git tree, so if we notice that the git
three state is dirty during the RPM build, we should fail early and
ask the user to commit their changes first before re-trying the build.

Signed-off-by: Steve Kuznetsov <[email protected]>
@stevekuznetsov stevekuznetsov force-pushed the skuznets/ensure-clean-tree branch from d76d3f4 to cec748f Compare February 17, 2017 16:56
@openshift-bot
Copy link
Contributor

Evaluated for origin test up to cec748f

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_future/303/) (Base Commit: 774a283)

@stevekuznetsov
Copy link
Contributor Author

[merge]

@stevekuznetsov
Copy link
Contributor Author

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to cec748f

@openshift-bot
Copy link
Contributor

openshift-bot commented Feb 20, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_future/351/) (Base Commit: cf7e336) (Image: devenv-rhel7_5941)

@openshift-bot openshift-bot merged commit e376a9a into openshift:master Feb 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants