Skip to content

Commit e13a1ce

Browse files
committed
Drop support for EOL Ubuntu 18.04 and Ubuntu 20.04
Since we disable AppArmor with voxpupuli/gha-puppet#72 we should be able to remove the AppArmor workaround, which this commit does.
1 parent 969c6c4 commit e13a1ce

File tree

3 files changed

+2
-29
lines changed

3 files changed

+2
-29
lines changed

README.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -268,14 +268,7 @@ see [REFERENCE.md](REFERENCE.md)
268268

269269
## Limitations
270270

271-
* Puppet 6.1.0
272-
* Puppet Enterprise
273-
274-
The puppetlabs repositories can be found at:
275-
<http://yum.puppetlabs.com/> and <http://apt.puppetlabs.com/>
276-
277-
* RedHat 7, 8 or compatible (CentOS, Oracle Linux, etc)
278-
* Ubuntu 18.04, 20.04
271+
See `metadata.json` for supported Puppet platforms and components.
279272

280273
* Jira 8.x
281274

metadata.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@
8080
{
8181
"operatingsystem": "Ubuntu",
8282
"operatingsystemrelease": [
83-
"18.04",
84-
"20.04",
8583
"22.04"
8684
]
8785
}

spec/acceptance/mysql_spec.rb

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,10 @@
55
describe 'jira mysql' do
66
it 'installs with defaults' do
77
pp = <<-EOS
8-
# On ubuntu 20.04 and 22.04 the default is to install mariadb
9-
# As the ubuntu 20.04 runner we use in github actions allready has mysql installed
10-
# a apparmor error is triggerd when using mariadb in this test..
11-
# Forcing the use of mysql
12-
if $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '20.04') >= 0 {
13-
$mysql_service_name = 'mysql'
14-
$mysql_server_package = 'mysql-server'
15-
$mysql_client_package = 'mysql-client'
16-
} else {
17-
$mysql_service_name = undef
18-
$mysql_server_package = undef
19-
$mysql_client_package = undef
20-
}
21-
228
class { 'mysql::server':
239
root_password => 'strongpassword',
24-
package_name => $mysql_server_package,
25-
service_name => $mysql_service_name,
26-
}
27-
class { 'mysql::client':
28-
package_name => $mysql_client_package,
2910
}
11+
include mysql::client
3012
3113
$cs = 'utf8mb4'
3214

0 commit comments

Comments
 (0)