From 90294ac8445c56e883d3fc2adeed0a7ed9c5d517 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Fri, 2 Feb 2024 16:34:19 +0000 Subject: [PATCH] fix molecule instance creation for RL9 --- .github/workflows/ci.yml | 4 ++-- molecule/test1/molecule.yml | 6 +++--- molecule/test10/molecule.yml | 8 ++++---- molecule/test11/molecule.yml | 6 +++--- molecule/test12/molecule.yml | 6 +++--- molecule/test13/molecule.yml | 10 +++++----- molecule/test14/molecule.yml | 6 +++--- molecule/test1b/molecule.yml | 4 ++-- molecule/test1c/molecule.yml | 6 +++--- molecule/test2/molecule.yml | 10 +++++----- molecule/test3/molecule.yml | 10 +++++----- molecule/test4/molecule.yml | 6 +++--- molecule/test5/molecule.yml | 6 +++--- molecule/test6/molecule.yml | 2 +- molecule/test7/molecule.yml | 2 +- molecule/test8/molecule.yml | 10 +++++----- molecule/test9/molecule.yml | 10 +++++----- 17 files changed, 56 insertions(+), 56 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a2f3fa0..35e1026 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,6 @@ --- name: CI -on: +'on': pull_request: push: branches: @@ -56,7 +56,7 @@ jobs: - name: Install test dependencies. run: | - pip3 install -U ansible molecule-podman yamllint ansible-lint + pip3 install -U pip ansible>=2.9.0 molecule-plugins[podman] yamllint ansible-lint ansible-galaxy collection install containers.podman:>=1.10.1 # otherwise get https://github.com/containers/ansible-podman-collections/issues/428 - name: Display ansible version diff --git a/molecule/test1/molecule.yml b/molecule/test1/molecule.yml index 29d30ca..b3b933d 100644 --- a/molecule/test1/molecule.yml +++ b/molecule/test1/molecule.yml @@ -7,7 +7,7 @@ platforms: pre_build_image: true groups: - testohpc_login - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -19,7 +19,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -31,7 +31,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp diff --git a/molecule/test10/molecule.yml b/molecule/test10/molecule.yml index 9601f63..436b943 100644 --- a/molecule/test10/molecule.yml +++ b/molecule/test10/molecule.yml @@ -8,7 +8,7 @@ platforms: groups: - testohpc_login - initial - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -21,7 +21,7 @@ platforms: groups: - testohpc_compute - initial - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -34,7 +34,7 @@ platforms: groups: - testohpc_compute - initial - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -46,7 +46,7 @@ platforms: pre_build_image: true groups: # NB this is NOT in the "testohpc_compute" so that it isn't added to slurm.conf initially - new - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp diff --git a/molecule/test11/molecule.yml b/molecule/test11/molecule.yml index de2f7a6..59b8933 100644 --- a/molecule/test11/molecule.yml +++ b/molecule/test11/molecule.yml @@ -7,7 +7,7 @@ platforms: pre_build_image: true groups: - testohpc_login - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -21,7 +21,7 @@ platforms: - testohpc_compute - testohpc_compute_orig - testohpc_compute_new - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -34,7 +34,7 @@ platforms: groups: - testohpc_compute - testohpc_compute_orig - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp diff --git a/molecule/test12/molecule.yml b/molecule/test12/molecule.yml index 29d30ca..b3b933d 100644 --- a/molecule/test12/molecule.yml +++ b/molecule/test12/molecule.yml @@ -7,7 +7,7 @@ platforms: pre_build_image: true groups: - testohpc_login - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -19,7 +19,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -31,7 +31,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp diff --git a/molecule/test13/molecule.yml b/molecule/test13/molecule.yml index a64acf2..d8c322c 100644 --- a/molecule/test13/molecule.yml +++ b/molecule/test13/molecule.yml @@ -7,7 +7,7 @@ platforms: pre_build_image: true groups: - testohpc_control - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -20,7 +20,7 @@ platforms: pre_build_image: true groups: - testohpc_login - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -33,7 +33,7 @@ platforms: pre_build_image: true groups: - testohpc_login - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -46,7 +46,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -58,7 +58,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp diff --git a/molecule/test14/molecule.yml b/molecule/test14/molecule.yml index 29d30ca..b3b933d 100644 --- a/molecule/test14/molecule.yml +++ b/molecule/test14/molecule.yml @@ -7,7 +7,7 @@ platforms: pre_build_image: true groups: - testohpc_login - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -19,7 +19,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -31,7 +31,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp diff --git a/molecule/test1b/molecule.yml b/molecule/test1b/molecule.yml index 369a533..4b41d47 100644 --- a/molecule/test1b/molecule.yml +++ b/molecule/test1b/molecule.yml @@ -9,7 +9,7 @@ platforms: pre_build_image: true groups: - testohpc_login - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -21,7 +21,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp diff --git a/molecule/test1c/molecule.yml b/molecule/test1c/molecule.yml index f6759fc..f8b5c5d 100644 --- a/molecule/test1c/molecule.yml +++ b/molecule/test1c/molecule.yml @@ -7,7 +7,7 @@ platforms: pre_build_image: true groups: - testohpc_login - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -19,7 +19,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -31,7 +31,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp diff --git a/molecule/test2/molecule.yml b/molecule/test2/molecule.yml index cef6d49..390a9d6 100644 --- a/molecule/test2/molecule.yml +++ b/molecule/test2/molecule.yml @@ -7,7 +7,7 @@ platforms: pre_build_image: true groups: - testohpc_login - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -20,7 +20,7 @@ platforms: groups: - testohpc_compute - testohpc_part1 - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -33,7 +33,7 @@ platforms: groups: - testohpc_compute - testohpc_part1 - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -46,7 +46,7 @@ platforms: groups: - testohpc_compute - testohpc_part2 - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -59,7 +59,7 @@ platforms: groups: - testohpc_compute - testohpc_part2 - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp diff --git a/molecule/test3/molecule.yml b/molecule/test3/molecule.yml index 1e2868c..82e9695 100644 --- a/molecule/test3/molecule.yml +++ b/molecule/test3/molecule.yml @@ -7,7 +7,7 @@ platforms: pre_build_image: true groups: - testohpc_login - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -20,7 +20,7 @@ platforms: groups: - testohpc_compute - testohpc_grp1 - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -33,7 +33,7 @@ platforms: groups: - testohpc_compute - testohpc_grp1 - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -46,7 +46,7 @@ platforms: groups: - testohpc_compute - testohpc_grp2 - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -59,7 +59,7 @@ platforms: groups: - testohpc_compute - testohpc_grp2 - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp diff --git a/molecule/test4/molecule.yml b/molecule/test4/molecule.yml index 29d30ca..b3b933d 100644 --- a/molecule/test4/molecule.yml +++ b/molecule/test4/molecule.yml @@ -7,7 +7,7 @@ platforms: pre_build_image: true groups: - testohpc_login - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -19,7 +19,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -31,7 +31,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp diff --git a/molecule/test5/molecule.yml b/molecule/test5/molecule.yml index 29d30ca..b3b933d 100644 --- a/molecule/test5/molecule.yml +++ b/molecule/test5/molecule.yml @@ -7,7 +7,7 @@ platforms: pre_build_image: true groups: - testohpc_login - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -19,7 +19,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -31,7 +31,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp diff --git a/molecule/test6/molecule.yml b/molecule/test6/molecule.yml index b7c0c50..42137bb 100644 --- a/molecule/test6/molecule.yml +++ b/molecule/test6/molecule.yml @@ -7,7 +7,7 @@ platforms: pre_build_image: true groups: - testohpc_login - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp diff --git a/molecule/test7/molecule.yml b/molecule/test7/molecule.yml index 5b6d4c6..ad242d3 100644 --- a/molecule/test7/molecule.yml +++ b/molecule/test7/molecule.yml @@ -7,7 +7,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp diff --git a/molecule/test8/molecule.yml b/molecule/test8/molecule.yml index a64acf2..d8c322c 100644 --- a/molecule/test8/molecule.yml +++ b/molecule/test8/molecule.yml @@ -7,7 +7,7 @@ platforms: pre_build_image: true groups: - testohpc_control - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -20,7 +20,7 @@ platforms: pre_build_image: true groups: - testohpc_login - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -33,7 +33,7 @@ platforms: pre_build_image: true groups: - testohpc_login - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -46,7 +46,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -58,7 +58,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp diff --git a/molecule/test9/molecule.yml b/molecule/test9/molecule.yml index 15742c0..b68d802 100644 --- a/molecule/test9/molecule.yml +++ b/molecule/test9/molecule.yml @@ -7,7 +7,7 @@ platforms: pre_build_image: true groups: - testohpc_control - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -20,7 +20,7 @@ platforms: pre_build_image: true groups: - testohpc_login - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -33,7 +33,7 @@ platforms: pre_build_image: true groups: - testohpc_login - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -46,7 +46,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp @@ -58,7 +58,7 @@ platforms: pre_build_image: true groups: - testohpc_compute - command: /sbin/init + command: 'dnf -y install systemd && /sbin/init' # not in RL9 image tmpfs: - /run - /tmp