Skip to content

Conversation

@wking
Copy link
Member

@wking wking commented Aug 11, 2020

The comments made it harder for ART to auto-generate candidate promotion pull requests, because they needed to either use a comment-preserving YAML engine or blindly pattern match on strings instead of using a YAML engine to inject new versions. We don't really care about particular patch releases before they land in candidate. If ART wants to explain why it skipped patch numbers, they can do that in the pull request and/or commit message that adds the next version (e.g. 4.1.34 commit/PR could explain why 4.1.32 and 4.1.33 were skipped).

Generated with:

$ for F in channels/candidate-4.*; do A="$(grep -v '^$\|^#' "${F}")"; echo "${A}" > "${F}"; done

The comments made it harder for ART to auto-generate candidate
promotion pull requests, because they needed to either use a
comment-preserving YAML engine or blindly pattern match on strings
instead of using a YAML engine to inject new versions.  We don't
really care about particular patch releases before they land in
candidate.  If ART wants to explain why it skipped patch numbers, they
can do that in the pull request and/or commit message that adds the
next version (e.g. 4.1.34 commit/PR could explain why 4.1.32 and
4.1.33 were skipped).

Generated with:

  $ for F in channels/candidate-4.*; do A="$(grep -v '^$\|^#' "${F}")"; echo "${A}" > "${F}"; done
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 11, 2020
@vrutkovs
Copy link

/lgtm
/hold

Lets have ART and architects folks notified
/cc @thiagoalessio @eparis @sosiouxme

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 11, 2020
@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 11, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vrutkovs, wking

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Member

@LalatenduMohanty LalatenduMohanty left a comment

Choose a reason for hiding this comment

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

-1 for removing the comments at this point of time. May be 6 months down the line. What is the benefit of removing the comments? Why are we removing comments? I have not heard ART complaining about it recently.

@thiagoalessio
Copy link
Member

that's how we currently create cincinnati PRs: https://github.com/openshift/aos-cd-jobs/blob/master/pipeline-scripts/release.groovy

readYaml claims to use SnakeYAML under the hood.

That said, I don't personally remember any automated PR going wrong, removing comments ... but I'd recommend to invite @jupierce to this discussion.

@wking
Copy link
Member Author

wking commented Aug 12, 2020

Yeah, this change will remove the need for gymnastics like:

# We want to insert the previous minors right after versions: so they stay above other entries.
# Why not set it in right before the next minor begins? Because we don't confuse a comment line that might exist above the next minor.
# First, create a file with the content we want to insert
echo -n > ul.txt  # Clear from previous channels
for urn in ${releasesForUpgradeChannel.join(' ')} ; do
    echo "- \$urn" >> ul.txt  # add the entry to lines to insert
done
echo >> ul.txt
rm -f slice*  # Remove any files from previous csplit runs
csplit ${upgradeChannelFile} '/versions:/+1' --prefix slice   # create slice00 (up to and including versions:) and slice01 (everything after)
cat slice00 ul.txt slice01 > ${upgradeChannelFile}

ART could just add the version to the structured, ingested YAML and write structured YAML back to the file.

@openshift-ci-robot
Copy link

@wking: PR needs rebase.

Details

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-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 13, 2020
@sosiouxme
Copy link
Member

pretty sure if we wrote structured yaml it would not include the comments. most yaml libs don't have a way to preserve them.

they're certainly not functionally important, but if we'd like them to be there for information (certainly some entries could use an explanation), it would be better to incorporate them as an attribute in the data. it's true that the explanation could be in PR text, but that's not as easy to find.

i don't know that anyone is clamoring to change this - once the "gymnastics" are written, they only become a concern when we need to change them. i don't really think there is a strong argument for or against keeping these comments.

@sdodson
Copy link
Member

sdodson commented Sep 14, 2020

👍 If we find value in recording this data we should at least record it in a structured manner.

@wking
Copy link
Member Author

wking commented Sep 14, 2020

I find no value in recording this data for the candidate channel. I do find value in recording tombstones on later promotions, but that's #75.

@openshift-ci-robot
Copy link

@wking: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/images d8a6665 link /test images

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

@sdodson
Copy link
Member

sdodson commented Nov 11, 2020

#526 got rid of most of these, now they only exist in 4.2 and older channels
/close

@openshift-ci-robot
Copy link

@sdodson: Closed this PR.

Details

In response to this:

#526 got rid of most of these, now they only exist in 4.2 and older channels
/close

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants