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

Add support for Ubuntu 2404 and update pdk 3.3.0 #52

Merged
merged 5 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Drop support for historical OS flavours
- drop Ubuntu 12.02
- drop Ubuntu 14.02
- drop Ubuntu 16.02
- drop SLED/SLES 10
- drop SLED/SLES 11
- drop RedHat 5
- drop RedHat 6
  • Loading branch information
Henrik Hansson (EXT) committed Jan 28, 2025
commit c4a75ce586663429c03323fcadb0fa0c73597a78
8 changes: 0 additions & 8 deletions data/os/RedHat/5.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions data/os/RedHat/6.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions data/os/SLES/10.0-i386.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions data/os/SLES/10.0-x86_64.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions data/os/SLES/10.1-i386.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions data/os/SLES/10.1-x86_64.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions data/os/SLES/10.2-i386.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions data/os/SLES/10.2-x86_64.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions data/os/SLES/10.3-i386.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions data/os/SLES/10.3-x86_64.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions data/os/SLES/10.4-i386.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions data/os/SLES/10.4-x86_64.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions data/os/SLES/11.0-i386.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions data/os/SLES/11.0-x86_64.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions data/os/SLES/11.1-i386.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions data/os/SLES/11.1-x86_64.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions data/os/SLES/11.2-i386.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions data/os/SLES/11.2-x86_64.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions data/os/SLES/11.3-i386.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions data/os/SLES/11.3-x86_64.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions data/os/SLES/11.4-x86_64.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions data/os/Ubuntu/12.04.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions data/os/Ubuntu/14.04.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions data/os/Ubuntu/16.04.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

if $facts['os']['name'] == 'Ubuntu' {
# In 20.xx and later /bin is a symlink to usr/bin
if $facts['os']['release']['full'] =~ /^(10|12|14|16|18)/ {
if $facts['os']['release']['full'] =~ /^(18)/ {
file { 'awk_symlink':
ensure => link,
path => '/bin/awk',
Expand Down
6 changes: 0 additions & 6 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"6",
"7",
"8",
"9"
Expand All @@ -26,7 +25,6 @@
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"6",
"7",
"8",
"9"
Expand All @@ -35,24 +33,20 @@
{
"operatingsystem": "SLES",
"operatingsystemrelease": [
"11",
"12",
"15"
]
},
{
"operatingsystem": "SLED",
"operatingsystemrelease": [
"11",
"12",
"15"
]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"14.04",
"16.04",
"18.04",
"20.04",
"22.04"
Expand Down
22 changes: 1 addition & 21 deletions spec/classes/init_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@
on_supported_os.sort.each do |os, os_facts|
# OS specific module defaults
case os
when 'centos-5-x86_64', 'redhat-5-x86_64'
packages = [ 'libXmu.i386', 'tcl-devel.i386', 'tcsh' ]
rndrelease_version = nil
symlink_target = '/usr/lib/libtcl8.4.so'
when 'centos-6-x86_64', 'redhat-6-x86_64'
packages = [ 'libXmu.i686', 'tcl-devel.i686', 'tcsh' ]
rndrelease_version = nil
symlink_target = '/usr/lib/libtcl8.5.so'
when 'centos-7-x86_64', 'redhat-7-x86_64'
packages = [ 'tcsh', 'libX11.i686', 'perl-Tk', 'xterm' ]
rndrelease_version = nil
Expand All @@ -19,22 +11,10 @@
packages = [ 'tcsh', 'libX11.i686', 'libxcrypt.i686', 'libnsl.i686', 'perl-Tk', 'xterm' ]
rndrelease_version = nil
symlink_target = nil
when 'sles-10-x86_64'
packages = [ 'tcl-32bit', 'tcsh' ]
rndrelease_version = 'LMWP 2.0'
symlink_target = '/usr/lib/libtcl8.4.so'
when 'sles-11-x86_64'
packages = [ 'tcl-32bit', 'tcsh', 'xorg-x11-libXmu-32bit' ]
rndrelease_version = 'LMWP 3.3'
symlink_target = '/usr/lib/libtcl8.5.so'
when 'sles-12-x86_64', 'sles-15-x86_64'
packages = [ 'libXmu6-32bit', 'perl-Tk', 'tcl-32bit', 'tcsh', 'xterm' ]
rndrelease_version = nil
symlink_target = '/usr/lib/libtcl8.6.so'
when 'ubuntu-12.04-x86_64', 'ubuntu-14.04-x86_64', 'ubuntu-16.04-x86_64'
packages = [ 'libx11-6:i386', 'libc6:i386', 'tcsh', 'tcl-dev' ]
rndrelease_version = nil
symlink_target = nil
when 'ubuntu-18.04-x86_64', 'ubuntu-20.04-x86_64'
packages = [ 'libc6:i386', 'libx11-6:i386', 'perl-tk', 'tcl-dev', 'tcsh', 'xterm' ]
rndrelease_version = nil
Expand Down Expand Up @@ -81,7 +61,7 @@

# Ubuntu specific special specialities
if os_facts[:os]['name'] == 'Ubuntu'
if os_facts[:os]['release']['full'].match?(%r{^(10|12|14|16|18)})
if os_facts[:os]['release']['full'].match?(%r{^(18)})
it do
is_expected.to contain_file('awk_symlink').only_with(
{
Expand Down
Loading