Skip to content

Commit 22539aa

Browse files
committed
CI: Switch to latest rockylinux/rockylinux images
The curated official images for Rocky Linux are not updated [1]. Use images from the Rocky Linux Docker Hub repository instead [2] with the latest 8 and 9 tags. [1] https://hub.docker.com/_/rockylinux [2] https://hub.docker.com/r/rockylinux/rockylinux
1 parent 59c85f8 commit 22539aa

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ name: CI
88

99
jobs:
1010
build:
11-
name: Build Rocky9 container image
12-
# Upstream rockylinux:9.3 images don't contain systemd, which means /sbin/init fails.
11+
name: Build Rocky Linux 9 container image
12+
# Upstream rockylinux/rockylinux:9 images don't contain systemd, which means /sbin/init fails.
1313
# A workaround of using "/bin/bash -c 'dnf -y install systemd && /sbin/init'"
1414
# as the container command is flaky.
15-
# This job builds an image using the upstream rockylinux:9.3 image which ensures
15+
# This job builds an image using the upstream rockylinux/rockylinux:9 image which ensures
1616
# that the image used for the molecule workflow is always updated.
1717
runs-on: ubuntu-latest
1818
defaults:
@@ -23,16 +23,16 @@ jobs:
2323
uses: actions/checkout@v4
2424

2525
- name: Build image
26-
run: podman build -t rocky93systemd:latest .
26+
run: podman build -t rocky9systemd:latest .
2727

2828
- name: Save image
29-
run: podman save --output rocky93systemd.docker rocky93systemd:latest
29+
run: podman save --output rocky9systemd.docker rocky9systemd:latest
3030

3131
- name: Upload rocky9 image
3232
uses: actions/upload-artifact@v4
3333
with:
34-
name: rocky93systemd
35-
path: molecule/images/rocky93systemd.docker
34+
name: rocky9systemd
35+
path: molecule/images/rocky9systemd.docker
3636

3737
molecule:
3838
name: Molecule
@@ -42,8 +42,8 @@ jobs:
4242
fail-fast: false
4343
matrix:
4444
image:
45-
- 'rockylinux:8.9'
46-
- 'localhost/rocky93systemd'
45+
- 'rockylinux/rockylinux:8'
46+
- 'localhost/rocky9systemd'
4747
scenario:
4848
- test1
4949
- test1b
@@ -61,7 +61,7 @@ jobs:
6161
exclude:
6262
# mariadb package provides /usr/bin/mysql on RL8 which doesn't work with geerlingguy/mysql role
6363
- scenario: test4
64-
image: 'rockylinux:8.9'
64+
image: 'rockylinux/rockylinux:8'
6565

6666
steps:
6767
- name: Check out the codebase.
@@ -70,14 +70,14 @@ jobs:
7070
- name: Download rocky9 container image
7171
uses: actions/download-artifact@v4
7272
with:
73-
name: rocky93systemd
74-
path: molecule/images/rocky93systemd.docker
75-
if: matrix.image == 'localhost/rocky93systemd'
73+
name: rocky9systemd
74+
path: molecule/images/rocky9systemd.docker
75+
if: matrix.image == 'localhost/rocky9systemd'
7676

7777
- name: Load rocky9 container image
78-
run: podman load --input rocky93systemd.docker/rocky93systemd.docker
78+
run: podman load --input rocky9systemd.docker/rocky9systemd.docker
7979
working-directory: molecule/images
80-
if: matrix.image == 'localhost/rocky93systemd'
80+
if: matrix.image == 'localhost/rocky9systemd'
8181

8282
- name: Set up Python 3.
8383
uses: actions/setup-python@v4

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This Ansible role installs packages and performs configuration to provide an Ope
66

77
As a role it must be used from a playbook, for which a simple example is given below. This approach means it is totally modular with no assumptions about available networks or any cluster features except for some hostname conventions. Any desired cluster fileystem or other required functionality may be freely integrated using additional Ansible roles or other approaches.
88

9-
The minimal image for nodes is a RockyLinux 8 GenericCloud image.
9+
The minimal image for nodes is a Rocky Linux 8 GenericCloud image.
1010

1111
## Role Variables
1212

molecule/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ test15 | 1 | Y | As for #1 but also tests parti
2626

2727
# Local Installation & Running
2828

29-
Local installation on a RockyLinux 8.x machine looks like:
29+
Local installation on a Rocky Linux 8.x machine looks like:
3030

3131
sudo dnf install -y podman
3232
sudo dnf install podman-plugins # required for DNS
@@ -39,17 +39,17 @@ Local installation on a RockyLinux 8.x machine looks like:
3939
pip install -r molecule/requirements.txt
4040
ansible-galaxy collection install containers.podman:>=1.10.1
4141

42-
Build a RockyLinux 9.3 image with systemd included:
42+
Build a Rocky Linux 9 image with systemd included:
4343

4444
cd ansible-role-openhpc/molecule/images
45-
podman build -t rocky93systemd:latest .
45+
podman build -t rocky9systemd:latest .
4646

4747
Run tests, e.g.:
4848

4949
cd ansible-role-openhpc/
5050
MOLECULE_NO_LOG="false" MOLECULE_IMAGE=rockylinux:8.9 molecule test --all
5151

52-
where the image may be `rockylinux:8.9` or `localhost/rocky93systemd`.
52+
where the image may be `rockylinux:8.9` or `localhost/rocky9systemd`.
5353

5454
Other useful options during development:
5555
- Prevent destroying instances by using `molecule test --destroy never`

molecule/images/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
FROM rockylinux:9.3
1+
FROM rockylinux/rockylinux:9
22
RUN dnf install -y systemd && dnf clean all

0 commit comments

Comments
 (0)