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

Update git_pillar runner to support new git ext_pillar config schema #29277

Merged
merged 2 commits into from Nov 30, 2015

Conversation

Projects
None yet
3 participants
@terminalmage
Member

terminalmage commented Nov 30, 2015

This also fixes a broken ref to the legacy class for handling git_pillar using
the old configuration schema. Lastly, it fixes how salt.utils.gitfs checks whether
updates were fetched, for newer GitPython releases.

Resolves #29071.

Separate repo locking logic into its own function
This removes repo locking from GitBase.fetch_remotes(), allowing for
locking to be performed by other code (for example, the
git_pillar.update runner).

It also fixes how salt.utils.gitfs checks whether updates were fetched
in newer GitPython releases. Pre 0.3.3, a git.FetchInfo object would
only be returned for heads/tags which were updated. The updated logic
will look for these objects in the return data from the fetch, and
analyze the git.FetchInfo objects to determine if there were updates.
Update git_pillar runner to support new git ext_pillar config schema
This also fixes a broken ref to the legacy class for handling git_pillar
using the old configuration schema.

@terminalmage terminalmage reopened this Nov 30, 2015

cachedout added a commit that referenced this pull request Nov 30, 2015

Merge pull request #29277 from terminalmage/issue29071
Update git_pillar runner to support new git ext_pillar config schema

@cachedout cachedout merged commit 459d30f into saltstack:2015.8 Nov 30, 2015

3 of 6 checks passed

jenkins/salt-pr-rs-cent6-n Salt PR - RS CentOS 6 #291 — FAILURE
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #10116 — FAILURE
Details
default Merged build started.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #11581 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #2648 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #11289 — SUCCESS
Details

@terminalmage terminalmage deleted the terminalmage:issue29071 branch Nov 30, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment