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

.gitignore: Drop auto-generated content #60

Merged
merged 1 commit into from
Mar 17, 2021

Conversation

wking
Copy link
Member

@wking wking commented Aug 4, 2020

From the docs:

Which file to place a pattern in depends on how the pattern is meant to be used.

  • Patterns which should be version-controlled and distributed to other repositories via clone (i.e., files that all developers will want to ignore) should go into a .gitignore file.
  • ...
  • Patterns which a user wants Git to ignore in all situations (e.g., backup or temporary files generated by the user's editor of choice) generally go into a file specified by core.excludesFile in the user's ~/.gitconfig. Its default value is $XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore is used instead.

So editor files are not appropriate for the project's versioned-controlled .gitignore. We could keep the Go stuff, but it's not clear to me if we have tooling that generates any of those outside of the temporary build directories which already have manually-curated .gitignore entries.

From [1]:

  Which file to place a pattern in depends on how the pattern is meant to be used.

  * Patterns which should be version-controlled and distributed to
    other repositories via clone (i.e., files that all developers will
    want to ignore) should go into a .gitignore file.

  ...

  * Patterns which a user wants Git to ignore in all situations (e.g.,
    backup or temporary files generated by the user's editor of
    choice) generally go into a file specified by core.excludesFile in
    the user's ~/.gitconfig. Its default value is
    $XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set
    or empty, $HOME/.config/git/ignore is used instead.

So editor files are not appropriate for the project's
versioned-controlled .gitignore.  We could keep the Go stuff, but it's
not clear to me if we have tooling that generates any of those outside
of the temporary build directories which already have manually-curated
.gitignore entries.

[1]: https://git-scm.com/docs/gitignore#_description
@openshift-merge-robot
Copy link
Contributor

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

Test name Commit Details Rerun command
ci/prow/operator-e2e fb719e4 link /test operator-e2e

Full PR test history. Your PR dashboard.

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.

@openshift-bot
Copy link

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci-robot openshift-ci-robot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jan 23, 2021
@openshift-bot
Copy link

Stale issues rot after 30d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle rotten.
Rotten issues close after an additional 30d of inactivity.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle rotten
/remove-lifecycle stale

@openshift-ci-robot openshift-ci-robot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels Feb 22, 2021
PratikMahajan pushed a commit to PratikMahajan/cincinnati-operator that referenced this pull request Mar 17, 2021
channels/fast-4.2: Promote 4.2.18 (and 4.2.18+amd64 to fast-4.3)
PratikMahajan pushed a commit to PratikMahajan/cincinnati-operator that referenced this pull request Mar 17, 2021
Expanding on the link from b1465b7 (Information on why 4.3.2 and
4.3.3 not in fast and stable channels of 4.3, 2020-03-03, openshift#87).
Coarse blocks landed in 1161d00 (Added 4.3.2->4.3.3 to channels,
2020-03-06, openshift#100), but the leak only affects 4.y -> 4.(y+1) updates,
since those are the only transitions where manifests dropped container
ports [1].

Block 4.2 -> 4.3 for 4.3 before 4.3.5 because of the port bug.  4.2 ->
4.3.1 had been blocked before, although that block was lifted in
c641bbd (channels/fast-4.2: Promote 4.2.18 (and 4.2.18+amd64 to
fast-4.3), 2020-02-19, openshift#60).  I think 1161d00's broader .* blocks
(which I'm relaxing to 4.2.* blocks) on the earlier 4.3 releases were
because the Multus bug affects all updates, but, as explained in
a5f394d (blocked-edges/4.3.*: Drop references to Multus bug
1805444, 2020-03-20, openshift#119), the Multus bug is actually not an update
blocker.

Also, no need to talk about these in the channel YAML files, since we
aren't tombstoning the releases (we discovered the bug after marking
the releases supported by tagging them into fast channels).

[1]: https://bugzilla.redhat.com/show_bug.cgi?id=1801300#c35
PratikMahajan pushed a commit to PratikMahajan/cincinnati-operator that referenced this pull request Mar 17, 2021
It's been at least 24 days since the fast promotions landed, so finish
the "phased rollout" and put them in stable.

* 4.2.16+amd64 was promoted to the feeder fast-4.3 by 7660e1d
  (Merge pull request openshift#73 from wking/4.2.16-to-fast-4.3, 2020-02-21).
* There was no 4.2.17 (no releases in the week after 4.2.16).
* 4.2.18+amd64 was promoted to the feeder fast-4.3 by fa66fd4
  (Merge pull request openshift#60 from wking/fast-4.2.18, 2020-02-20).
* 4.2.19+amd64 was promoted to the feeder fast-4.3 by 04c5b05
  (Merge pull request openshift#64 from thiagoalessio/fast-4.2, 2020-02-24).

The previous comments about "only valid into" were from 505f7a6
(Add 4.2 edges into stable-4.3, 2020-03-12, openshift#109), and I'm not clear
on the motivation.
.gitignore Show resolved Hide resolved
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wking

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

The pull request process is described here

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 17, 2021
@PratikMahajan
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 17, 2021
@wking
Copy link
Member Author

wking commented Mar 17, 2021

Gitignore change unrelated to broken e2e.

/override ci/prow/operator-e2e

@openshift-ci-robot
Copy link

@wking: Overrode contexts on behalf of wking: ci/prow/operator-e2e

In response to this:

Gitignore change unrelated to broken e2e.

/override ci/prow/operator-e2e

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.

@wking
Copy link
Member Author

wking commented Mar 17, 2021

images:

error: build error: failed to pull image: After retrying 2 times, Pull image still failed due to error: while pulling "docker://registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7" as "registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7": Error initializing source docker://registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7: Error reading manifest rhel-8-golang-1.15-openshift-4.7 in registry.svc.ci.openshift.org/ocp/builder: unknown: unable to pull manifest from registry.ci.openshift.org/ocp/builder:latest: manifest unknown: manifest unknown

/test images

@wking
Copy link
Member Author

wking commented Mar 17, 2021

/override ci/prow/images

But we'll need to dig into why these are repeatedly failing.

@openshift-ci-robot
Copy link

@wking: Overrode contexts on behalf of wking: ci/prow/images

In response to this:

/override ci/prow/images

But we'll need to dig into why these are repeatedly failing.

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-merge-robot openshift-merge-robot merged commit 10c6428 into openshift:master Mar 17, 2021
@wking wking deleted the ignore-cleanup branch March 17, 2021 19:30
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. lgtm Indicates that a PR is ready to be merged. lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants