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

Drop Debian 10 and Ubuntu 18.04 support #191

Merged
merged 2 commits into from
May 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,6 @@ Changing these after registration has no affect.

## Limitations

The Gitlab CI runner installation is at the moment only tested on:
* CentOS 7/8
* Debian 10/11
* Ubuntu 18.04/20.04/22.04

For the current list of tested and support operating systems, please checkout the metadata.json file.

It is currently not possible to alter registration specific configuration settings after a runner is registered.
Expand Down
2 changes: 0 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,12 @@
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"10",
"11"
]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"18.04",
"20.04",
"22.04"
]
Expand Down
37 changes: 17 additions & 20 deletions spec/classes/gitlab_ci_runner_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -330,30 +330,27 @@
end
end

# puppetlabs-docker doesn't support CentOS 6 anymore.
unless facts[:os]['name'] == 'CentOS' && facts[:os]['release']['major'] == '6'
context 'with manage_docker => true' do
let(:params) do
{
manage_docker: true
}
end
context 'with manage_docker => true' do
let(:params) do
{
manage_docker: true
}
end

it { is_expected.to compile }
it { is_expected.to compile }

it { is_expected.to contain_class('docker') }
it { is_expected.to contain_class('docker') }

it do
is_expected.to contain_class('docker::images').
with(
images: {
'ubuntu_focal' => {
'image' => 'ubuntu',
'image_tag' => 'focal'
}
it do
is_expected.to contain_class('docker::images').
with(
images: {
'ubuntu_focal' => {
'image' => 'ubuntu',
'image_tag' => 'focal'
}
)
end
}
)
end
end

Expand Down
9 changes: 0 additions & 9 deletions spec/setup_acceptance_node.pp
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,6 @@
ensure => present,
}

# https://gitlab.com/gitlab-org/omnibus-gitlab/issues/2229
# There is no /usr/share/zoneinfo in latest Docker image for ubuntu 16.04
# Gitlab installer fail without this file
if $facts['os']['release']['major'] in ['16.04', '18.04'] {
package { 'tzdata':
ensure => present,
}
}

# Setup Puppet Bolt
$bolt_config = @("BOLTPROJECT"/L)
modulepath: "/etc/puppetlabs/code/modules:/etc/puppetlabs/code/environments/production/modules"
Expand Down
Loading