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

enable virtual package names in pyobjects renderer #24668

Merged
merged 3 commits into from
Jun 16, 2015

Conversation

grischa
Copy link
Contributor

@grischa grischa commented Jun 15, 2015

Fixes Issue #23458 for me

@grischa
Copy link
Contributor Author

grischa commented Jun 15, 2015

It's a silly issue and a trivial fix. Would be great if this could be back ported in a way that it enters packaged versions ASAP.

@jfindlay
Copy link
Contributor

@grischa, we prefer fixes to be merged into the oldest supported release, since release branches are regularly merged forward, see https://docs.saltstack.com/en/latest/topics/development/contributing.html#which-salt-branch. You can either resubmit this against 2015.5 or wait for us to backport it. The next release will come out in about 3 weeks.

@jfindlay
Copy link
Contributor

@grischa, also, thanks for fixing this and would you mind looking at the failed unit tests? Thanks.

@jfindlay jfindlay added Minor Change Core relates to code central or existential to Salt bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch labels Jun 15, 2015
@grischa
Copy link
Contributor Author

grischa commented Jun 16, 2015

I had a look at the failing tests, @jfindlay.
The unit tests failed because those virtual packages were disabled when no architecture is set. Now those tests set an architecture and all packages are available as expected.
However, now there is an integration test failure that I have no idea about. It passes on my test set up, only fails in Jenkins.

@jfindlay
Copy link
Contributor

The CentOS 7 tests are totally wacked. I'm not sure what that test failure on ubuntu is. It looks unrelated to me, thanks.

jfindlay added a commit that referenced this pull request Jun 16, 2015
enable virtual package names in pyobjects renderer
@jfindlay jfindlay merged commit eef9317 into saltstack:develop Jun 16, 2015
@rallytime rallytime added ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. and removed bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch labels Jun 16, 2015
@grischa
Copy link
Contributor Author

grischa commented Jun 16, 2015

Great, thanks!

@grischa grischa deleted the pyobjects_honour_virtual branch June 16, 2015 23:57
jfindlay added a commit that referenced this pull request Jun 17, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Core relates to code central or existential to Salt Tests-Passed ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants