Skip to content

Commit

Permalink
Replace CentOS 8 with Rocky 8 (#31)
Browse files Browse the repository at this point in the history
* Replace CentOS 8 with Rocky 8

* No longer support globus::cli, globus::timer or globus::sdk on Debian 9
  • Loading branch information
treydock authored Apr 5, 2022
1 parent b1cd2c2 commit 816f9ab
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
matrix:
set:
- "centos-7"
- "centos-8"
- "rocky-8"
- "debian-9"
- "debian-10"
- "ubuntu-1804"
Expand Down
2 changes: 1 addition & 1 deletion .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
acceptance_matrix:
set:
- centos-7
- centos-8
- rocky-8
- debian-9
- debian-10
- ubuntu-1804
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,12 @@ The `globus_info` fact exposes the information stored in `/var/lib/globus-connec
Tested using

* RedHat/CentOS 7
* RedHat/CentOS 8
* RedHat/Rocky 8
* Debian 9
* Debian 10
* Ubuntu 18.04
* Ubuntu 20.04

## Limitations

At this time `globus::cli`, `globus::timer` and `globus::sdk` are not supported on Debian 9 due to older system Python
11 changes: 8 additions & 3 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,12 @@
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"7",
"7"
]
},
{
"operatingsystem": "Rocky",
"operatingsystemrelease": [
"8"
]
},
Expand Down Expand Up @@ -75,7 +80,7 @@
"gridftp",
"hpc"
],
"pdk-version": "1.17.0",
"pdk-version": "2.1.0",
"template-url": "https://github.com/treydock/pdk-templates.git#master",
"template-ref": "heads/master-0-gad5f473"
"template-ref": "heads/master-0-g089be8b"
}
2 changes: 1 addition & 1 deletion spec/acceptance/globus_cli_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper_acceptance'

describe 'globus::cli class:' do
describe 'globus::cli class:', unless: fact('os.name') == 'Debian' && fact('os.release.major') == '9' do
context 'with default parameters' do
it 'runs successfully' do
pp = 'include globus::cli'
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/globus_sdk_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper_acceptance'

describe 'globus::sdk class:' do
describe 'globus::sdk class:', unless: fact('os.name') == 'Debian' && fact('os.release.major') == '9' do
context 'with default parameters' do
it 'runs successfully' do
pp = 'include globus::sdk'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
HOSTS:
centos-8:
rocky-8:
roles:
- agent
platform: el-8-x86_64
hypervisor: docker
image: centos:8
image: rockylinux/rockylinux:8
docker_preserve_image: true
docker_cmd:
- '/usr/sbin/init'
docker_image_commands:
- 'dnf install -y dnf-utils'
- 'dnf config-manager --set-enabled powertools'
- 'dnf install -y wget which cronie iproute initscripts langpacks-en glibc-all-langpacks'
- 'dnf install -y wget which cronie iproute initscripts langpacks-en glibc-all-langpacks cpio'
docker_env:
- LANG=en_US.UTF-8
- LANGUAGE=en_US.UTF-8
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/ubuntu-1804.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ HOSTS:
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- "rm -f /etc/dpkg/dpkg.cfg.d/excludes"
- 'apt-get install -y wget net-tools locales apt-transport-https ca-certificates'
- 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates'
- 'locale-gen en_US.UTF-8'
docker_env:
- LANG=en_US.UTF-8
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/ubuntu-2004.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ HOSTS:
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- "rm -f /etc/dpkg/dpkg.cfg.d/excludes"
- 'apt-get install -y wget net-tools locales apt-transport-https ca-certificates'
- 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates'
- 'locale-gen en_US.UTF-8'
docker_env:
- LANG=en_US.UTF-8
Expand Down

0 comments on commit 816f9ab

Please sign in to comment.