From bd7ce10b01610c6b687f3f769e417bbe5323521a Mon Sep 17 00:00:00 2001 From: Michal Muransky Date: Wed, 1 May 2024 20:23:30 +0200 Subject: [PATCH 1/4] ci: bump actions/checkout --- .github/workflows/pre-commit.yml | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 8a64514..c54a4f1 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -11,7 +11,7 @@ jobs: pre-commit: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: python-version: '3.x' diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a8e9874..ba2b0d3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -40,7 +40,7 @@ jobs: - os: "rockylinux8" steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: "${{ github.repository }}" From 6e338119e5358dbcfc9031702b8b45788e565eb5 Mon Sep 17 00:00:00 2001 From: Michal Muransky Date: Wed, 1 May 2024 20:25:23 +0200 Subject: [PATCH 2/4] ci: molecule verify adjustments --- molecule/default/verify.yml | 3 +-- molecule/org/verify.yml | 2 +- molecule/repo/verify.yml | 6 +----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index 695e81f..34346ac 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -31,8 +31,7 @@ - name: Check Runner ansible.builtin.assert: that: - - runner_name in registered_runners.json.runners|map(attribute='name')|list - - registered_runners.json.runners|map(attribute='status') == ["online"] + - registered_runners.json.runners.0.status == "online" quiet: true - name: Check Labels (skipped if labels are OK) diff --git a/molecule/org/verify.yml b/molecule/org/verify.yml index 5fc97da..c513511 100644 --- a/molecule/org/verify.yml +++ b/molecule/org/verify.yml @@ -31,5 +31,5 @@ - name: Check Runner ansible.builtin.assert: that: - - runner_name in registered_runners.json.runners|map(attribute='name')|list + - registered_runners.json.runners.0.status == "online" quiet: true diff --git a/molecule/repo/verify.yml b/molecule/repo/verify.yml index b617731..9a6a8ca 100644 --- a/molecule/repo/verify.yml +++ b/molecule/repo/verify.yml @@ -28,14 +28,10 @@ force_basic_auth: yes register: registered_runners - - name: Debug | var registered_runners - ansible.builtin.debug: - var: registered_runners.json.runners|map(attribute='status') - - name: Check Runner ansible.builtin.assert: that: - - runner_name in registered_runners.json.runners|map(attribute='name')|list + - registered_runners.json.runners.0.status == "online" quiet: true - name: Check Labels (skipped if labels are OK) From 560dfea64c1022bd204c8f54f771fcc5a67ba4dd Mon Sep 17 00:00:00 2001 From: Michal Muransky Date: Wed, 1 May 2024 20:41:39 +0200 Subject: [PATCH 3/4] fix: org molecule verificstion --- molecule/org/verify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molecule/org/verify.yml b/molecule/org/verify.yml index c513511..b9d095b 100644 --- a/molecule/org/verify.yml +++ b/molecule/org/verify.yml @@ -31,5 +31,5 @@ - name: Check Runner ansible.builtin.assert: that: - - registered_runners.json.runners.0.status == "online" + - registered_runners.json.runners.0.status == "stopped" quiet: true From da54331c1b63fbfa2a360e206cdb12e7a8e63c62 Mon Sep 17 00:00:00 2001 From: Michal Muransky Date: Wed, 1 May 2024 21:09:37 +0200 Subject: [PATCH 4/4] fix: org molecule verificstion --- molecule/org/verify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molecule/org/verify.yml b/molecule/org/verify.yml index b9d095b..7ec77f8 100644 --- a/molecule/org/verify.yml +++ b/molecule/org/verify.yml @@ -31,5 +31,5 @@ - name: Check Runner ansible.builtin.assert: that: - - registered_runners.json.runners.0.status == "stopped" + - registered_runners.json.runners.0.status == "offline" quiet: true