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.

Sign up for GitHub

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

Add Ubuntu 20.04 support, clean up testing, drop EOL versions & untested distros #296

Merged
merged 21 commits into from
Jun 30, 2020
Merged

Add Ubuntu 20.04 support, clean up testing, drop EOL versions & untested distros #296

merged 21 commits into from
Jun 30, 2020

Conversation

jeffbyrnes
Copy link
Contributor

@jeffbyrnes jeffbyrnes commented Jun 19, 2020 •
edited
Loading

Description

  • Add support & testing on Ubuntu 20.04
  • Add testing on CentOS 8
  • Clean up/DRY up Debian family’s conditional attributes
  • Update attributes for Debian 10
  • Drop support for EOL versions:
    • Debian 8
    • CentOS 6
    • Ubuntu < 16.04
    • Amazon Linux 1
  • Drop support for untested distros:
    • OpenSUSE Leap
    • Fedora
    • OpenBSD

Issues Resolved

n/a

Check List

  • All tests pass. See TESTING.md for details. All tests that passed in the previous release, and any new tests, pass.
  • New functionality includes testing.
  • New functionality has been documented in the README if applicable.

@jeffbyrnes jeffbyrnes added Tech Debt Will improve the maintainability of the codebase Priority: Medium Will bring visible benefit to the project Release: Minor Release to Chef Supermarket as a minor release when merged labels Jun 19, 2020
@jeffbyrnes jeffbyrnes requested review from tas50 and xorima June 19, 2020 19:48
@jeffbyrnes jeffbyrnes self-assigned this Jun 19, 2020
@jeffbyrnes jeffbyrnes force-pushed the add-ubuntu-20.04-support branch 2 times, most recently from 6c3ef55 to dffbc15 Compare June 19, 2020 20:07
tas50
tas50 reviewed Jun 19, 2020
View reviewed changes
attributes/default.rb Outdated Show resolved Hide resolved
@jeffbyrnes jeffbyrnes requested a review from tas50 June 20, 2020 15:54
@jeffbyrnes
Copy link
Contributor Author

@tas50 I wouldn’t normally suggest this, but the current state of tests passing is identical to what was passing with v7.2.0, so perhaps it’s ok to merge this in and proceed with more changes (or a release?)

I’m gonna keep working on it, and see about getting RHEL, CentOS, Debian, and maybe Amazon Linux 2 to pass, at least with the packaged install.

tas50
tas50 reviewed Jun 29, 2020
View reviewed changes
attributes/default.rb Outdated Show resolved Hide resolved
tas50
tas50 reviewed Jun 29, 2020
View reviewed changes
attributes/default.rb Outdated Show resolved Hide resolved
@jeffbyrnes jeffbyrnes force-pushed the add-ubuntu-20.04-support branch 2 times, most recently from fb9b760 to d46932b Compare June 29, 2020 12:29
@jeffbyrnes jeffbyrnes changed the title Add Ubuntu 20.04 support Add Ubuntu 20.04 support, clean up testing, drop EOL versions & untested distros Jun 29, 2020
@jeffbyrnes
refactor: Drop Ubuntu < 16.04 support; it’s EOL
da88f96 
Simplify version conditional attributes
@jeffbyrnes
refactor: Drop Debian 8 support, it’s EOL
af941b9
@jeffbyrnes
feat: Update Ubuntu 18.04 to build latest PHP 7.2
a63f54d 
Ubuntu 18.04 installs PHP 7.2 by default via its APT packages.

Now this cookbook will also build the latest PHP 7.2 from source, to
match the packages.
@jeffbyrnes
fix: Update attributes for Debian 10
d2be518 
Also, DRY up a few of the Debian family attributes that are common.
@jeffbyrnes
feat: Add support for Ubuntu 20.04
7aca680
@jeffbyrnes
tests: Drop untested distros’ support & CentOS 6
ce20aa1 
* CentOS 6 is EOL
* opensusleap, fedora, freebsd are all not tested by CI, and have not
passed any tests in a long time. Less is More.
@jeffbyrnes
docs: Add comments to attributes for clarity
ea19b53
@jeffbyrnes
FIXUP: update metadata for support
a97a927
@jeffbyrnes
fix: DRY up php::package recipe
3d1e544 
The second condition will never be reached; dropping it.
@jeffbyrnes
refactor: Simplify php::source & php::recompile
27d5a17 
* Less syntactic sugar, does the same thing.
* Execute is simpler than specifically using the bash resource.
@jeffbyrnes
tests: Rename test suite to be less repetitive
07ea909 
We know tese are tests. No need to repeat ourselves.
@jeffbyrnes
fix: Ensure we have build tools for php_pear
f0edde8 
Some installs need the build tools.
tas50
tas50 reviewed Jun 29, 2020
View reviewed changes
attributes/default.rb
@@ -47,29 +48,25 @@
default['php']['fpm_ini_control'] = false

case node['platform_family']
when 'rhel', 'fedora', 'amazon'
Copy link
Contributor

Choose a reason for hiding this comment

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

it might be easier to just add this to the test matrix

tas50
tas50 reviewed Jun 29, 2020
View reviewed changes
attributes/default.rb Outdated Show resolved Hide resolved
tas50
tas50 reviewed Jun 29, 2020
View reviewed changes
metadata.rb Show resolved Hide resolved
tas50
tas50 reviewed Jun 29, 2020
View reviewed changes
metadata.rb Outdated Show resolved Hide resolved
tas50
tas50 reviewed Jun 29, 2020
View reviewed changes
metadata.rb Show resolved Hide resolved
tas50
tas50 reviewed Jun 29, 2020
View reviewed changes
recipes/package.rb Outdated Show resolved Hide resolved
tas50
tas50 reviewed Jun 29, 2020
View reviewed changes
recipes/recompile.rb Outdated Show resolved Hide resolved
@jeffbyrnes
refactor: Drop Amazon Linux 1 support
46f0ad0 
Already dropped from tests & metadata.
@jeffbyrnes
Copy link
Contributor Author

@tas50 thanks for the notes! Updated per your suggestions, though some of the kitchen tests are still unlikely to pass.

@jeffbyrnes
tests: DRY/update unit tests
b3ecb2c 
* Take advantage of RubySpec shared examples
* Drop CentOS 6
* Update Amazon Linux
* Add Ubuntu 20.04
@jeffbyrnes
fix: Use working URL for PHP source
5cfc56e
@jeffbyrnes
fix: Use last stable version of PHP 5.6
757f955 
It has been discontinued since 2019-01-10, so we should consider
dropping it entirely.
@jeffbyrnes
fix: Add back supported RHEL flavors
cba479d 
Oracle & Scientific are variations on CentOS, so they come for free.
@jeffbyrnes
refactor: Speed up package installs via array
b3b47c1 
h/t to @tas50 for the suggestion
@kitchen-porter
Copy link
Contributor

1 Warning
⚠️ This is a big Pull Request.

Generated by 🚫 Danger

@detjensrobert detjensrobert mentioned this pull request Jun 30, 2020
Merged
3 tasks
@xorima
Copy link
Contributor

xorima commented Jun 30, 2020

You can drop ubuntu-1604 support if you want to, 18.04 and 20.04 are good enough for me

@tas50 tas50 merged commit 433017c into master Jun 30, 2020
@tas50 tas50 deleted the add-ubuntu-20.04-support branch June 30, 2020 15:51
@tas50
Copy link
Contributor

tas50 commented Jun 30, 2020

Nice start to cleaning this up. Thanks @jeffbyrnes

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

@tas50 tas50 tas50 left review comments

@xorima xorima Awaiting requested review from xorima

Assignees

@jeffbyrnes jeffbyrnes

Labels
Priority: Medium Will bring visible benefit to the project Release: Minor Release to Chef Supermarket as a minor release when merged Tech Debt Will improve the maintainability of the codebase
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jeffbyrnes @kitchen-porter @xorima @tas50