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

Fix regression in dynamic pillarenv #51317

Merged
merged 2 commits into from Jan 25, 2019

Conversation

Projects
None yet
4 participants
@terminalmage
Copy link
Contributor

commented Jan 24, 2019

#50417 caused a regression in which the env name is not properly detected as base when get_checkout_target() returns the branch name corresponding to that repo's base config option. This corrects that regression.

Fix regression in dynamic pillarenv
#50417 caused a regression in
which the env name is not properly detected as `base` when
`get_checkout_target()` returns the branch name corresponding to that
repo's `base` config option. This corrects that regression.
@dwoz

dwoz approved these changes Jan 25, 2019

@s0undt3ch s0undt3ch merged commit c8db7e3 into saltstack:2018.3.4 Jan 25, 2019

1 check passed

WIP Ready for review
Details

@terminalmage terminalmage deleted the terminalmage:fix-pr-50417 branch Jan 28, 2019

@sathieu

This comment has been minimized.

Copy link
Contributor

commented Jan 30, 2019

This introduced a regression too:

minion:

    Data failed to compile:

----------

    Pillar failed to render with the following messages:

----------

    Specified SLS 'projects.gitlab' in environment 'prod' is not available on the salt master

(On 2018.3.3 with #50417, #49987, #50626, #50768, #50783, #51317, #51212, #50784).

The pillarenv and saltenv are base. gitfs_base and git_pillar_base are prod

@terminalmage

This comment has been minimized.

Copy link
Contributor Author

commented Jan 30, 2019

How could this PR possibly have created a regression in 2018.3.3 when it was just opened less than a week ago???

😕

@sathieu

This comment has been minimized.

Copy link
Contributor

commented Jan 30, 2019

As said, I use 2018.3.3 with #50417, #49987, #50626, #50768, #50783, #51317, #51212, #50784 applied. Because of this, I reverted #51317

@sathieu

This comment has been minimized.

Copy link
Contributor

commented Feb 12, 2019

@terminalmage The regression is fixed by #51597.

@sathieu

This comment has been minimized.

Copy link
Contributor

commented Feb 27, 2019

@dwoz @terminalmage @s0undt3ch Sadly, this PR is not in 2019.2.0 (like #51212).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.