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-6717) Mergeback 1.x to Master and remove Puppet 3.8 #283

Merged

Conversation

glennsarti
Copy link
Contributor

@glennsarti glennsarti commented Mar 22, 2018

This PR

  • Merges back 1.x into master
  • Un-reverts any commits that were revertted for Puppet 3.8.x support
  • Modifies metadata and Travis to drop 3.8
  • Update apt to 4.4.0 and remove deprecated functions

Other PRs will come along to extract further Puppet 3.8 functionality

The minimum targetted version is now 4.7.0 (The earliest LTS agent and Puppet 4 Data Types)

glennsarti and others added 12 commits March 12, 2018 15:25
Previously the CA Certs were not required to be explicitly installed however
the forge appears to be using newer certificates now which are not in the
default OpenSSL pack on Windows nodes.  This commit uses the install_ca_certs
helper to install the CA Certs prior to downloading modules from the forge.
Previously the puppetlabs-inifile module was still compatible with Puppet
3.8, however as of 2.1.1 the syntax changes are not able to be used with older
ruby (1.8) which is common with older Puppet versions.  This commit pins the
inifile module version and updates the test fixtures.
Previously the acceptance tests would use the latest versions of dependant
modules, however due to supporting Puppet 3.8 this is no longer possible.  This
commit pins the acceptance module versions to that specified in the metadata
json file.
Version 2.6.10 introduced an error that was failing on Puppet gem 4.0.0.  This
commit pins rspec-puppet to 2.6.9.  This should be removed once the error
is fixed.
(MODULES-6717) Configure 1.x branch for last 3.8 compatible release
This commit prepares the module for a v1.6.0 release

This is the last release that will be compatible with Puppet 3.x.
…e-1.6.0

(MODULES-6832) Prepare for v1.6.0 release
* 1.x:
  (MODULES-6832) Prepare for v1.6.0 release
  (MODULES-6826) Pin rspec-puppet to 2.6.9
  (MODULES-6717) Pin module versions in acceptance test fixtures
  (MODULES-6708) Use puppetlabs-inifile 2.1.0 or less
  (MODULES-6708) Install CA Certs for module downloading
  Revert "(MODULES-6280) ensure compatibility to puppetlabs/apt > 3.0.0 (puppetlabs#268)"
Previously the APT module versions were increased however the test fixtures
were not modified.  This commit changes the testing fixtures to the latest
possible versions.
This commit begins the process to remove Puppet 3.x support and make Puppet
4.7.0 the lower bound of testing and applicability.
@glennsarti glennsarti force-pushed the MODULES-6717-mergeback-and-drop-3.8 branch from 728d8db to e3dfc66 Compare March 22, 2018 07:36
@puppetcla
Copy link

CLA signed by all contributors.

@MikaelSmith
Copy link
Contributor

That seems ok but failed Travis CI.

@glennsarti
Copy link
Contributor Author

@MikaelSmith Yeah...Working on that today.

@glennsarti glennsarti changed the title (MODULES-6717) Mergeback 1.x to Master and remove Puppet 3.8 {WIP}(MODULES-6717) Mergeback 1.x to Master and remove Puppet 3.8 Mar 23, 2018
@MikaelSmith
Copy link
Contributor

Green. Still a wip?

$disable_proxy = false,
$install_options = $::puppet_agent::params::install_options,
$msi_move_locked_files = false,
Pattern[/^x86$/,/^x64$/,/^i386$/,/^i86pc$/,/^amd64$/,/^x86_64$/,/^power$/,/^sun4[uv]$/, /^ppc64le$/, /^aarch64$/, /PowerPC_POWER/] $arch = $::architecture,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is kind of unfortunate formatting. Can we alias the type somewhere else?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had some issues with this but got it sorted!

Previously apt modules prior to 4.4.0 used deprecated functions in StdLib.
This commit updates apt to a minimum of 4.4.0 and updates the debian tests
with a new fact requirement.  This commit also removes the use of deprecated
functions in the puppet_agent module itself, and moving to Puppet 4 data types.
@glennsarti glennsarti force-pushed the MODULES-6717-mergeback-and-drop-3.8 branch from e87adbc to 99b5b63 Compare March 26, 2018 07:23
@glennsarti glennsarti changed the title {WIP}(MODULES-6717) Mergeback 1.x to Master and remove Puppet 3.8 (MODULES-6717) Mergeback 1.x to Master and remove Puppet 3.8 Mar 26, 2018
@glennsarti
Copy link
Contributor Author

@MikaelSmith No Longer WIP. Ready for merge.

Copy link
Contributor

@MikaelSmith MikaelSmith left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a lot of puppet 3 related code that could still be removed, but this looks like a good start.

@MikaelSmith MikaelSmith merged commit 250a610 into puppetlabs:master Mar 26, 2018
@glennsarti
Copy link
Contributor Author

@MikaelSmith Yeah I started ripping stuff out but the PR was just getting too big. as a priority I need to get the acceptance tests working again before I do anything else.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants