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

Jump to bottom

Backport 50771 to 2018.3 #51207

Merged
merged 4 commits into from Jan 24, 2019
Merged

Backport 50771 to 2018.3 #51207

merged 4 commits into from Jan 24, 2019

Conversation

twangboy
Copy link
Contributor

What does this PR do?

Backports #50771 to 2018.3 branch to fix the following failed tests:

integration.states.test_pkg.PkgTest.test_pkg_cap_001_installed
integration.states.test_pkg.PkgTest.test_pkg_cap_002_already_installed
integration.states.test_pkg.PkgTest.test_pkg_cap_003_installed_multipkg_with_version
integration.states.test_pkg.PkgTest.test_pkg_cap_004_latest
integration.states.test_pkg.PkgTest.test_pkg_cap_005_downloaded
integration.states.test_pkg.PkgTest.test_pkg_cap_006_uptodate

What issues does this PR fix or reference?

Resolves saltstack/salt-ci-images#1255

Tests written?

Yes

Commits signed with GPG?

Yes

@s0undt3ch s0undt3ch merged commit 5a398a3 into saltstack:2018.3 Jan 24, 2019
@Ch3LL Ch3LL added bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch v2018.3.4 unsupported version labels Jan 24, 2019
@Ch3LL Ch3LL mentioned this pull request Jan 25, 2019
Merged
@Ch3LL Ch3LL 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 Jan 25, 2019
@twangboy twangboy deleted the fix_test_pkg branch January 25, 2019 23:11
dwoz added a commit that referenced this pull request Jan 27, 2019
@dwoz
Merge pull request #51338 from Ch3LL/bp-51207
43a9d2f 
Backport #51207 into 2018.3.4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@s0undt3ch s0undt3ch s0undt3ch approved these changes

Assignees
No one assigned
Labels
v2018.3.4 unsupported version ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@twangboy @s0undt3ch @Ch3LL @garethgreenaway