Skip to content

cmdlib: consistently commit layers with same options#2703

Merged
cgwalters merged 1 commit intocoreos:mainfrom
jlebon:pr/consistent-commit
Feb 10, 2022
Merged

cmdlib: consistently commit layers with same options#2703
cgwalters merged 1 commit intocoreos:mainfrom
jlebon:pr/consistent-commit

Conversation

@jlebon
Copy link
Copy Markdown
Member

@jlebon jlebon commented Feb 10, 2022

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: #2603

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

echo -n "Committing ${tmp_overridesdir}/contentsetrootfs... "
ostree commit --repo="$tmprepo" --tree=dir="${tmp_overridesdir}"/contentsetrootfs -b contentset
commit_ostree_layer "${tmp_overridesdir}/contentsetrootfs" contentset
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

OK, and the bug was missing --timestamp here, which is why it only applies to RHCOS.

@cgwalters
Copy link
Copy Markdown
Member

/retest

@cgwalters
Copy link
Copy Markdown
Member

rhcos failure is openshift/os#714 (comment)
/override ci/prow/rhcos

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Feb 10, 2022

@cgwalters: Overrode contexts on behalf of cgwalters: ci/prow/rhcos

Details

In response to this:

rhcos failure is openshift/os#714 (comment)
/override ci/prow/rhcos

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.

@cgwalters cgwalters enabled auto-merge (rebase) February 10, 2022 23:35
@cgwalters cgwalters merged commit 3fac918 into coreos:main Feb 10, 2022
@jlebon
Copy link
Copy Markdown
Member Author

jlebon commented Feb 11, 2022

/cherry-pick rhcos-4.10

@jlebon
Copy link
Copy Markdown
Member Author

jlebon commented Feb 11, 2022

/cherrypick rhcos-4.10

@openshift-cherrypick-robot
Copy link
Copy Markdown

@jlebon: new pull request created: #2706

Details

In response to this:

/cherry-pick rhcos-4.10

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.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@jlebon: new pull request could not be created: failed to create pull request against coreos/coreos-assembler#rhcos-4.10 from head openshift-cherrypick-robot:cherry-pick-2703-to-rhcos-4.10: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for openshift-cherrypick-robot:cherry-pick-2703-to-rhcos-4.10."}],"documentation_url":"https://docs.github.com/rest/reference/pulls#create-a-pull-request"}

Details

In response to this:

/cherrypick rhcos-4.10

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 jlebon deleted the pr/consistent-commit branch April 22, 2023 23:34
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.

RHCOS 4.10/4.11 x86_64 builds seem to ignore change detection; always building

3 participants