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

Note the commit for the release packaged by hack/build-cross.sh #11236

Merged

Conversation

stevekuznetsov
Copy link
Contributor

In order to be accepted as a valid set of releases by scripts like
hack/build-images.sh, etc., hack/build-cross.sh should note the
Git commit used to build binaries and place it in the release dir.

Signed-off-by: Steve Kuznetsov skuznets@redhat.com

@smarterclayton

@@ -35,6 +35,7 @@ OS_GOFLAGS="${OS_GOFLAGS:-} ${OS_IMAGE_COMPILE_GOFLAGS}" os::build::build_static
OS_RELEASE_ARCHIVE="openshift-origin"
OS_BUILD_PLATFORMS=("${platforms[@]}")
os::build::place_bins "${OS_CROSS_COMPILE_BINARIES[@]}"
echo "${OS_GIT_COMMIT}" > "${OS_LOCAL_RELEASEPATH}/.commit"
Copy link
Contributor

Choose a reason for hiding this comment

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

Need to distinguish between dirty and not here. If you're tree state is dirty this would be wrong

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is there a meaningful value to place in .commit if it is dirty? Or should we just skip it?

Copy link
Contributor

Choose a reason for hiding this comment

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

Not really (not without a lot of complexity). At minimum you can't do this in a dirty state today so writing out a message and changing the commit to be whatever the tree state flag is (there was COMMIT-dirty, that could work).

In order to be accepted as a valid set of releases by scripts like
hack/build-images.sh, etc., hack/build-cross.sh should note the
Git commit used to build binaries and place it in the release dir.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
@stevekuznetsov
Copy link
Contributor Author

@smarterclayton updated

@stevekuznetsov
Copy link
Contributor Author

@smarterclayton any comments?

@smarterclayton
Copy link
Contributor

[merge]

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 83e168e

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10056/) (Base Commit: dbdc2f8)

@marun
Copy link
Contributor

marun commented Oct 14, 2016

flake #11374 re-[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 83e168e

@openshift-bot
Copy link
Contributor

openshift-bot commented Oct 14, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10065/) (Base Commit: 098e0ee) (Image: devenv-rhel7_5179)

@openshift-bot openshift-bot merged commit d942e98 into openshift:master Oct 14, 2016
@stevekuznetsov stevekuznetsov deleted the skuznets/note_release_commit branch January 31, 2017 14:20
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.

4 participants