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

Prevent metadata changes in a stable branch #48994

Merged
merged 1 commit into from
Nov 26, 2018
Merged

Prevent metadata changes in a stable branch #48994

merged 1 commit into from
Nov 26, 2018

Conversation

sivel
Copy link
Member

@sivel sivel commented Nov 21, 2018 •
edited

SUMMARY

Prevent metadata changes in a stable branch

ISSUE TYPE
  • Feature Pull Request
COMPONENT NAME

test/sanity/validate-modules/main.py

ADDITIONAL INFORMATION
$ sed -i 's/core/community/' ./lib/ansible/modules/utilities/logic/debug.py
$ ./test/sanity/validate-modules/validate-modules --base-branch stable-2.7 lib/ansible/modules/utilities/logic/debug.py
lib/ansible/modules/utilities/logic/debug.py:0:0: E334 ANSIBLE_METADATA cannot be changed in a point release for a stable branch
$ ./test/sanity/validate-modules/validate-modules --base-branch devel lib/ansible/modules/utilities/logic/debug.py
$

jctanner
jctanner approved these changes Nov 21, 2018
View reviewed changes
Copy link
Contributor

@jctanner jctanner left a comment

Choose a reason for hiding this comment

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

shipit

@ansibot
Copy link
Contributor

ansibot commented Nov 21, 2018

Hi @sivel, thank you for submitting this pull-request!

click here for bot help

@ansibot
Copy link
Contributor

ansibot commented Nov 21, 2018

cc @acozine @gundalow @mattclay
click here for bot help

@ansibot ansibot added affects_2.8 This issue/PR affects Ansible v2.8 docs This issue/PR relates to or includes documentation. feature This issue/PR relates to a feature request. shipit This PR is ready to be merged by Core small_patch support:core This issue/PR relates to code supported by the Ansible Engineering Team. test This PR relates to tests. labels Nov 21, 2018
@acozine
Copy link
Contributor

acozine commented Nov 21, 2018

thanks @sivel this will save us from ourselves

@thaumos
Copy link
Contributor

thaumos commented Nov 21, 2018

@sivel, I assume we have override privileges to still merge if we have had a business agreement on this?

@sivel
Copy link
Member Author

sivel commented Nov 21, 2018

@sivel, I assume we have override privileges to still merge if we have had a business agreement on this?

@thaumos yes. It's just a CI failure, which doesn't prevent us from merging. We just have to accept that it failed, and if it failed only for that reason, we could merge it.

CI should only fail in the PR state, and not after merge.

@sivel
Copy link
Member Author

sivel commented Nov 21, 2018

Also, fwiw, this only fails on PRs with a stable base branch. This does not apply to devel.

@gundalow gundalow merged commit 7287d39 into ansible:devel Nov 26, 2018
sivel added a commit to sivel/ansible that referenced this pull request Nov 26, 2018
@sivel
[stable-2.7] Prevent metadata changes in a stable branch (ansible#48994)
2ed1c46 
(cherry picked from commit 7287d39)

Co-authored-by: Matt Martz <matt@sivel.net>
sivel added a commit to sivel/ansible that referenced this pull request Nov 26, 2018
@sivel
[stable-2.6] Prevent metadata changes in a stable branch (ansible#48994…
59cb02f 
…).

(cherry picked from commit 7287d39)

Co-authored-by: Matt Martz <matt@sivel.net>
mattclay pushed a commit that referenced this pull request Nov 26, 2018
@sivel @mattclay
[stable-2.6] Prevent metadata changes in a stable branch (#48994). (#…
6969edc 
…49134)

* [stable-2.6] Prevent metadata changes in a stable branch (#48994).
(cherry picked from commit 7287d39)

Co-authored-by: Matt Martz <matt@sivel.net>

* Address rebase issues

* Fix metadata comparison
acozine pushed a commit that referenced this pull request Nov 26, 2018
@sivel @acozine
[stable-2.7] Prevent metadata changes in a stable branch (#48994) (#4…
edae7b0 
…9131)

* [stable-2.7] Prevent metadata changes in a stable branch (#48994)
(cherry picked from commit 7287d39)

Co-authored-by: Matt Martz <matt@sivel.net>

* Fix metadata comparison
mjmayer pushed a commit to mjmayer/ansible that referenced this pull request Nov 30, 2018
@sivel @mjmayer
Prevent metadata changes in a stable branch (ansible#48994)
00e3b4b
@ansible ansible locked and limited conversation to collaborators Jul 22, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@gundalow gundalow gundalow approved these changes

@jctanner jctanner jctanner approved these changes

@thaumos thaumos Awaiting requested review from thaumos

Assignees
No one assigned
Labels
affects_2.8 This issue/PR affects Ansible v2.8 docs This issue/PR relates to or includes documentation. feature This issue/PR relates to a feature request. shipit This PR is ready to be merged by Core small_patch support:core This issue/PR relates to code supported by the Ansible Engineering Team. test This PR relates to tests.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@sivel @ansibot @acozine @thaumos @gundalow @jctanner