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

(MODULES-10712) Fix mod_ldap on RH/CentOS 5 and 6 #2041

Merged

Conversation

h-haaks
Copy link
Contributor

@h-haaks h-haaks commented Jun 19, 2020

#1913 changed ldap package to always be mod_ldap, but on rhel/centos 5 and 6 mod_ldap is in the httpd package and there is no mod_ldap package.

@h-haaks h-haaks requested a review from a team as a code owner June 19, 2020 10:54
@puppet-community-rangefinder
Copy link

apache::params is a class

Breaking changes to this file WILL impact these 12 modules (exact match):
Breaking changes to this file MAY impact these 16 modules (near match):

This module is declared in 174 of 575 indexed public Puppetfiles.


These results were generated with Rangefinder, a tool that helps predict the downstream impact of breaking changes to elements used in Puppet modules. You can run this on the command line to get a full report.

Exact matches are those that we can positively identify via namespace and the declaring modules' metadata. Non-namespaced items, such as Puppet 3.x functions, will always be reported as near matches only.

@h-haaks
Copy link
Contributor Author

h-haaks commented Jun 19, 2020

Not really sure why acceptance is failing on el8...
Is #2040 causing this?

@sanfrancrisko
Copy link
Contributor

@h-haaks Apologies - those test failures were indeed caused by #2040. Not quite sure what I was thinking, but that PR should have gone through a CI test run before being merged. For some reason it did not kick off the tests and I didn't pick up on that before merging, thinking it was all good to go.

I'm prep'ing a fix to puppetlabs:master in #2042 if you want to rebase and pull it in after

@h-haaks h-haaks force-pushed the fix-mod_ldap-on-rhel6 branch from 2b6ec77 to b406f19 Compare June 25, 2020 05:25
@h-haaks
Copy link
Contributor Author

h-haaks commented Jun 25, 2020

@sanfrancrisko I have pulled the last changes into StatensPensjonskasse:master and rebased StatensPensjonskasse:fix-mod_ldap-on-rhel6.
Still doesn't pass acceptance ... :(

@sanfrancrisko
Copy link
Contributor

@h-haaks I'm seeing failures too on #2021 which I'm trying to fix up and push. There's been a bit of scope creep now and things have gotten a bit more complicated, but I'm hoping to have it merged to puppetlabs:master later today. I'll ping you when I do.

@sanfrancrisko
Copy link
Contributor

@h-haaks If you rebase with puppetlabs:master now, I'm hoping that will resolve the test failures.

@sanfrancrisko
Copy link
Contributor

Also, probably worth making you aware of #2021 - it shouldn't cause a conflict, but worth highlighting since the change is in a similar spot.

@h-haaks h-haaks force-pushed the fix-mod_ldap-on-rhel6 branch from b406f19 to cbef540 Compare June 29, 2020 19:29
@codecov-commenter
Copy link

codecov-commenter commented Jun 29, 2020

Codecov Report

Merging #2041 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2041   +/-   ##
=======================================
  Coverage   58.49%   58.49%           
=======================================
  Files          12       12           
  Lines         212      212           
=======================================
  Hits          124      124           
  Misses         88       88           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4cde24f...cbef540. Read the comment docs.

@h-haaks
Copy link
Contributor Author

h-haaks commented Jun 29, 2020

@h-haaks If you rebase with puppetlabs:master now, I'm hoping that will resolve the test failures.

Thanks @sanfrancrisko now all tests are green :)
I have assigned https://tickets.puppetlabs.com/browse/MODULES-10712 to me and changed status to 'READY FOR REVIEW'

@sanfrancrisko
Copy link
Contributor

@h-haaks The PR LGTM. I quickly tested locally with an acceptance test for a bit of extra sanity. I put up a PR with the test against your fork, if you wouldn't mind merging? https://github.com/StatensPensjonskasse/puppetlabs-apache/pull/1

After that, happy to merge 👍

Thanks again for the fix.

Ciaran McCrisken and others added 2 commits June 30, 2020 19:29
(MODULES-10712) Exclude test from RHEL 8.x platforms
(MODULES-10712) Add acceptance test for 'mod::ldap'
@h-haaks
Copy link
Contributor Author

h-haaks commented Jul 1, 2020

@h-haaks The PR LGTM. I quickly tested locally with an acceptance test for a bit of extra sanity. I put up a PR with the test against your fork, if you wouldn't mind merging? StatensPensjonskasse#1

After that, happy to merge 👍

Thanks again for the fix.

Merged and tested all green. Ready for merge @sanfrancrisko :)

@sanfrancrisko sanfrancrisko merged commit 51ce2ad into puppetlabs:master Jul 1, 2020
@sanfrancrisko sanfrancrisko changed the title MODULES-10712 fix mod_ldap on RH/CentOS 5 and 6 (MODULES-10712) Fix mod_ldap on RH/CentOS 5 and 6 Jul 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants