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.

Sign up for GitHub

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

Jump to bottom

[rhcos-4.10] cmdlib: consistently commit layers with same options #2706

Merged
merged 1 commit into from
Feb 11, 2022
Merged

[rhcos-4.10] cmdlib: consistently commit layers with same options #2706

merged 1 commit into from
Feb 11, 2022

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #2703

/assign jlebon

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Feb 11, 2022
Merged
@openshift-ci
Copy link

openshift-ci bot commented Feb 11, 2022

Hi @openshift-cherrypick-robot. Thanks for your PR.

I'm waiting for a coreos member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@jlebon
Copy link
Member

jlebon commented Feb 11, 2022

/lgtm
/ok-to-test

@jlebon
cmdlib: consistently commit layers with same options
e2c6b94 
Make a helper for committing OSTree layers which contains all the
canonicalization flags. Notably `--timestamp` which ensures that we get
a consistent checksum for the same source git commit.

Fixes: openshift/os#712
Fixes: coreos#2603
@miabbott
Copy link
Member

/lgtm /ok-to-test

/lgtm on your own cherry-pick...tricksy! 😄

@jlebon
Copy link
Member

jlebon commented Feb 11, 2022

Yeah, you're right. Let's reflect agreement here too instead of just having it live in Slack.

/lgtm cancel

cgwalters
cgwalters approved these changes Feb 11, 2022
View reviewed changes
Copy link
Member

@cgwalters cgwalters left a comment

Choose a reason for hiding this comment

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

We don't actually use lgtm here anyways though right? But lgtm.

@jlebon
Copy link
Member

jlebon commented Feb 11, 2022

CoreOS CI doesn't work correctly on branches.

/override continuous-integration/jenkins/pr-merge

@openshift-ci
Copy link

openshift-ci bot commented Feb 11, 2022

@jlebon: Overrode contexts on behalf of jlebon: continuous-integration/jenkins/pr-merge

In response to this:

CoreOS CI doesn't work correctly on branches.

/override continuous-integration/jenkins/pr-merge

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

miabbott
miabbott approved these changes Feb 11, 2022
View reviewed changes
Copy link
Member

@miabbott miabbott left a comment

Choose a reason for hiding this comment

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

👍

@jlebon jlebon merged commit 3793708 into coreos:rhcos-4.10 Feb 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miabbott miabbott miabbott approved these changes

@cgwalters cgwalters cgwalters approved these changes

Assignees

@jlebon jlebon

Labels
ok-to-test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@openshift-cherrypick-robot @jlebon @miabbott @cgwalters