From a7d4f88b795aedeea56caa0fd7d86b76347b2b69 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:09:41 -0500 Subject: [PATCH 01/59] fix(CI): Break up workflows and use templates --- .github/workflows/ci.yml | 10 ++++++++-- .../workflows/{test.yml => molecule-template.yml} | 7 +------ .github/workflows/test-default.yml | 12 ++++++++++++ .github/workflows/test-ipv6.yml | 12 ++++++++++++ .github/workflows/test-single-node.yml | 12 ++++++++++++ 5 files changed, 45 insertions(+), 8 deletions(-) rename .github/workflows/{test.yml => molecule-template.yml} (96%) create mode 100644 .github/workflows/test-default.yml create mode 100644 .github/workflows/test-ipv6.yml create mode 100644 .github/workflows/test-single-node.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 54be8ff..6d8ecde 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,6 +10,12 @@ on: jobs: lint: uses: ./.github/workflows/lint.yml - test: - uses: ./.github/workflows/test.yml + test-default: + uses: ./.github/workflows/test-default.yml + needs: [lint] + test-ipv6: + uses: ./.github/workflows/test-ipv6.yml + needs: [lint] + test-single-node: + uses: ./.github/workflows/test-single-node.yml needs: [lint] diff --git a/.github/workflows/test.yml b/.github/workflows/molecule-template.yml similarity index 96% rename from .github/workflows/test.yml rename to .github/workflows/molecule-template.yml index 10b6135..dbb7a9f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/molecule-template.yml @@ -1,5 +1,5 @@ --- -name: Test +name: Molecule Template on: workflow_call: jobs: @@ -7,11 +7,6 @@ jobs: name: Molecule runs-on: macos-12 strategy: - matrix: - scenario: - - default - - ipv6 - - single_node fail-fast: false env: PYTHON_VERSION: "3.11" diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml new file mode 100644 index 0000000..599797f --- /dev/null +++ b/.github/workflows/test-default.yml @@ -0,0 +1,12 @@ +--- +name: Test Default +on: + workflow_call: +jobs: + molecule: + strategy: + matrix: + scenario: + - default +extends: + - ./.github/workflows/molecule-template.yml diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml new file mode 100644 index 0000000..42b8e20 --- /dev/null +++ b/.github/workflows/test-ipv6.yml @@ -0,0 +1,12 @@ +--- +name: Test IPv6 +on: + workflow_call: +jobs: + molecule: + strategy: + matrix: + scenario: + - ipv6 +extends: + - ./.github/workflows/molecule-template.yml diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml new file mode 100644 index 0000000..5e8475f --- /dev/null +++ b/.github/workflows/test-single-node.yml @@ -0,0 +1,12 @@ +--- +name: Test Single Node +on: + workflow_call: +jobs: + molecule: + strategy: + matrix: + scenario: + - single_node +extends: + - ./.github/workflows/molecule-template.yml From 32b9bfa44f516925f80e0c381f8f0455acc1ac6d Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:11:55 -0500 Subject: [PATCH 02/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 2 -- .github/workflows/test-default.yml | 2 +- .github/workflows/test-ipv6.yml | 2 +- .github/workflows/test-single-node.yml | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index dbb7a9f..a6d434a 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -1,7 +1,5 @@ --- name: Molecule Template -on: - workflow_call: jobs: molecule: name: Molecule diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index 599797f..9cf5879 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -9,4 +9,4 @@ jobs: scenario: - default extends: - - ./.github/workflows/molecule-template.yml + - .github/workflows/molecule-template.yml diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index 42b8e20..3b40883 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -9,4 +9,4 @@ jobs: scenario: - ipv6 extends: - - ./.github/workflows/molecule-template.yml + - .github/workflows/molecule-template.yml diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index 5e8475f..13e9d8c 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -9,4 +9,4 @@ jobs: scenario: - single_node extends: - - ./.github/workflows/molecule-template.yml + - .github/workflows/molecule-template.yml From 2b4ef14b497dd62a1a2e1c08f99ccf28dd02fa48 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:15:25 -0500 Subject: [PATCH 03/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 4 ++-- .github/workflows/test-ipv6.yml | 4 ++-- .github/workflows/test-single-node.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index 9cf5879..af4c035 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -3,10 +3,10 @@ name: Test Default on: workflow_call: jobs: + steps: + - uses: ./.github/workflows/molecule-template.yml molecule: strategy: matrix: scenario: - default -extends: - - .github/workflows/molecule-template.yml diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index 3b40883..4488266 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -3,10 +3,10 @@ name: Test IPv6 on: workflow_call: jobs: + steps: + - uses: ./.github/workflows/molecule-template.yml molecule: strategy: matrix: scenario: - ipv6 -extends: - - .github/workflows/molecule-template.yml diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index 13e9d8c..4325c11 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -3,10 +3,10 @@ name: Test Single Node on: workflow_call: jobs: + steps: + - uses: ./.github/workflows/molecule-template.yml molecule: strategy: matrix: scenario: - single_node -extends: - - .github/workflows/molecule-template.yml From 9483f18ae2559604376778fc568d55b5f3554e17 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:16:01 -0500 Subject: [PATCH 04/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index a6d434a..dbb7a9f 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -1,5 +1,7 @@ --- name: Molecule Template +on: + workflow_call: jobs: molecule: name: Molecule From fb6d94362c4e4b6a80ab19d2c2fb4e2d1c533595 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:18:09 -0500 Subject: [PATCH 05/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 2 +- .github/workflows/test-ipv6.yml | 2 +- .github/workflows/test-single-node.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index af4c035..b9d21a6 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -4,7 +4,7 @@ on: workflow_call: jobs: steps: - - uses: ./.github/workflows/molecule-template.yml + - uses: .github/workflows/molecule-template.yml molecule: strategy: matrix: diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index 4488266..1938260 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -4,7 +4,7 @@ on: workflow_call: jobs: steps: - - uses: ./.github/workflows/molecule-template.yml + - uses: .github/workflows/molecule-template.yml molecule: strategy: matrix: diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index 4325c11..5baf2ba 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -4,7 +4,7 @@ on: workflow_call: jobs: steps: - - uses: ./.github/workflows/molecule-template.yml + - uses: .github/workflows/molecule-template.yml molecule: strategy: matrix: From 14aa2f83839d9e54e9735dafebe45d8366808cc3 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:20:01 -0500 Subject: [PATCH 06/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 3 ++- .github/workflows/test-ipv6.yml | 3 ++- .github/workflows/test-single-node.yml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index b9d21a6..2861192 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -4,7 +4,8 @@ on: workflow_call: jobs: steps: - - uses: .github/workflows/molecule-template.yml + - name: Default + uses: .github/workflows/molecule-template.yml molecule: strategy: matrix: diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index 1938260..b35b359 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -4,7 +4,8 @@ on: workflow_call: jobs: steps: - - uses: .github/workflows/molecule-template.yml + - name: IPv6 + uses: .github/workflows/molecule-template.yml molecule: strategy: matrix: diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index 5baf2ba..1f59e75 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -4,7 +4,8 @@ on: workflow_call: jobs: steps: - - uses: .github/workflows/molecule-template.yml + - name: Single Node + uses: .github/workflows/molecule-template.yml molecule: strategy: matrix: From c2a3b9f56fd02f3c9dca89d4afc77140938a7c36 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:20:32 -0500 Subject: [PATCH 07/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index dbb7a9f..a6d434a 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -1,7 +1,5 @@ --- name: Molecule Template -on: - workflow_call: jobs: molecule: name: Molecule From 1e06289dca97815e28a23da358ed9f8361598ff0 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:26:35 -0500 Subject: [PATCH 08/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 3 ++- .github/workflows/test-default.yml | 2 +- .github/workflows/test-ipv6.yml | 2 +- .github/workflows/test-single-node.yml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index a6d434a..1cde890 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -8,7 +8,8 @@ jobs: fail-fast: false env: PYTHON_VERSION: "3.11" - + runs: + using: "composite" steps: - name: Check out the codebase uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index 2861192..29a9e9d 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -5,7 +5,7 @@ on: jobs: steps: - name: Default - uses: .github/workflows/molecule-template.yml + uses: ./.github/workflows/molecule-template.yml molecule: strategy: matrix: diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index b35b359..f4061fe 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -5,7 +5,7 @@ on: jobs: steps: - name: IPv6 - uses: .github/workflows/molecule-template.yml + uses: ./.github/workflows/molecule-template.yml molecule: strategy: matrix: diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index 1f59e75..a9c3e86 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -5,7 +5,7 @@ on: jobs: steps: - name: Single Node - uses: .github/workflows/molecule-template.yml + uses: ./.github/workflows/molecule-template.yml molecule: strategy: matrix: From 173e104663caea989f0bcbd564ee3cd74ef886b8 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:27:13 -0500 Subject: [PATCH 09/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index 1cde890..e49e765 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -1,5 +1,7 @@ --- name: Molecule Template +on: + workflow_call: jobs: molecule: name: Molecule From f19ff12057749bf03ecb9f25ed8944c321f98ba9 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:29:28 -0500 Subject: [PATCH 10/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 142 +++++++++++------------- 1 file changed, 66 insertions(+), 76 deletions(-) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index e49e765..812c380 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -1,88 +1,78 @@ --- name: Molecule Template -on: - workflow_call: -jobs: - molecule: - name: Molecule - runs-on: macos-12 - strategy: - fail-fast: false - env: - PYTHON_VERSION: "3.11" - runs: - using: "composite" - steps: - - name: Check out the codebase - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 - with: - ref: ${{ github.event.pull_request.head.sha }} +runs: + using: "composite" + steps: + - name: Check out the codebase + uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + with: + ref: ${{ github.event.pull_request.head.sha }} - - name: Configure VirtualBox - run: |- - sudo mkdir -p /etc/vbox - cat < /dev/null - * 192.168.30.0/24 - * fdad:bad:ba55::/64 - EOF + - name: Configure VirtualBox + run: |- + sudo mkdir -p /etc/vbox + cat < /dev/null + * 192.168.30.0/24 + * fdad:bad:ba55::/64 + EOF - - name: Cache pip - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- + - name: Cache pip + uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }} + restore-keys: | + ${{ runner.os }}-pip- - - name: Cache Vagrant boxes - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 - with: - path: | - ~/.vagrant.d/boxes - key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }} - restore-keys: | - vagrant-boxes + - name: Cache Vagrant boxes + uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + with: + path: | + ~/.vagrant.d/boxes + key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }} + restore-keys: | + vagrant-boxes - - name: Download Vagrant boxes for all scenarios - # To save some cache space, all scenarios share the same cache key. - # On the other hand, this means that the cache contents should be - # the same across all scenarios. This step ensures that. - run: ./.github/download-boxes.sh + - name: Download Vagrant boxes for all scenarios + # To save some cache space, all scenarios share the same cache key. + # On the other hand, this means that the cache contents should be + # the same across all scenarios. This step ensures that. + run: ./.github/download-boxes.sh - - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3 - with: - python-version: ${{ env.PYTHON_VERSION }} - cache: 'pip' # caching pip dependencies + - name: Set up Python ${{ env.PYTHON_VERSION }} + uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3 + with: + python-version: ${{ env.PYTHON_VERSION }} + cache: 'pip' # caching pip dependencies - - name: Install dependencies - run: | - echo "::group::Upgrade pip" - python3 -m pip install --upgrade pip - echo "::endgroup::" + - name: Install dependencies + run: | + echo "::group::Upgrade pip" + python3 -m pip install --upgrade pip + echo "::endgroup::" - echo "::group::Install Python requirements from requirements.txt" - python3 -m pip install -r requirements.txt - echo "::endgroup::" + echo "::group::Install Python requirements from requirements.txt" + python3 -m pip install -r requirements.txt + echo "::endgroup::" - - name: Test with molecule - run: molecule test --scenario-name ${{ matrix.scenario }} - timeout-minutes: 90 - env: - ANSIBLE_K3S_LOG_DIR: ${{ runner.temp }}/logs/k3s-ansible/${{ matrix.scenario }} - ANSIBLE_SSH_RETRIES: 4 - ANSIBLE_TIMEOUT: 60 - PY_COLORS: 1 - ANSIBLE_FORCE_COLOR: 1 + - name: Test with molecule + run: molecule test --scenario-name ${{ matrix.scenario }} + timeout-minutes: 90 + env: + ANSIBLE_K3S_LOG_DIR: ${{ runner.temp }}/logs/k3s-ansible/${{ matrix.scenario }} + ANSIBLE_SSH_RETRIES: 4 + ANSIBLE_TIMEOUT: 60 + PY_COLORS: 1 + ANSIBLE_FORCE_COLOR: 1 - - name: Upload log files - if: always() # do this even if a step before has failed - uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # 3.1.1 - with: - name: logs - path: | - ${{ runner.temp }}/logs + - name: Upload log files + if: always() # do this even if a step before has failed + uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # 3.1.1 + with: + name: logs + path: | + ${{ runner.temp }}/logs - - name: Delete old box versions - if: always() # do this even if a step before has failed - run: vagrant box prune --force + - name: Delete old box versions + if: always() # do this even if a step before has failed + run: vagrant box prune --force From ad672b3965ef1d6e753f35f620a93ba1de6a378a Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:30:20 -0500 Subject: [PATCH 11/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index 812c380..536399b 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -1,5 +1,7 @@ --- name: Molecule Template +on: + workflow_call: runs: using: "composite" steps: From 85c1826985f8626da9557ad62eabf31a1142c897 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:31:34 -0500 Subject: [PATCH 12/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 3 +-- .github/workflows/test-ipv6.yml | 3 +-- .github/workflows/test-single-node.yml | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index 29a9e9d..af4c035 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -4,8 +4,7 @@ on: workflow_call: jobs: steps: - - name: Default - uses: ./.github/workflows/molecule-template.yml + - uses: ./.github/workflows/molecule-template.yml molecule: strategy: matrix: diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index f4061fe..4488266 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -4,8 +4,7 @@ on: workflow_call: jobs: steps: - - name: IPv6 - uses: ./.github/workflows/molecule-template.yml + - uses: ./.github/workflows/molecule-template.yml molecule: strategy: matrix: diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index a9c3e86..4325c11 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -4,8 +4,7 @@ on: workflow_call: jobs: steps: - - name: Single Node - uses: ./.github/workflows/molecule-template.yml + - uses: ./.github/workflows/molecule-template.yml molecule: strategy: matrix: From 756c140beee621049ceda92c384662e7670aeb58 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:32:34 -0500 Subject: [PATCH 13/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index 536399b..11996bc 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -2,6 +2,14 @@ name: Molecule Template on: workflow_call: +jobs: + molecule: + name: Molecule + runs-on: macos-12 + strategy: + fail-fast: false + env: + PYTHON_VERSION: "3.11" runs: using: "composite" steps: From d90fde7b3b8a8062c50b67b9bbd8f1b468fa61b3 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:33:16 -0500 Subject: [PATCH 14/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 8 -------- .github/workflows/test-default.yml | 7 +++++++ .github/workflows/test-ipv6.yml | 7 +++++++ .github/workflows/test-single-node.yml | 7 +++++++ 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index 11996bc..536399b 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -2,14 +2,6 @@ name: Molecule Template on: workflow_call: -jobs: - molecule: - name: Molecule - runs-on: macos-12 - strategy: - fail-fast: false - env: - PYTHON_VERSION: "3.11" runs: using: "composite" steps: diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index af4c035..f9c88df 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -3,6 +3,13 @@ name: Test Default on: workflow_call: jobs: + molecule: + name: Molecule + runs-on: macos-12 + strategy: + fail-fast: false + env: + PYTHON_VERSION: "3.11" steps: - uses: ./.github/workflows/molecule-template.yml molecule: diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index 4488266..b99837d 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -3,6 +3,13 @@ name: Test IPv6 on: workflow_call: jobs: + molecule: + name: Molecule + runs-on: macos-12 + strategy: + fail-fast: false + env: + PYTHON_VERSION: "3.11" steps: - uses: ./.github/workflows/molecule-template.yml molecule: diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index 4325c11..b7a9784 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -3,6 +3,13 @@ name: Test Single Node on: workflow_call: jobs: + molecule: + name: Molecule + runs-on: macos-12 + strategy: + fail-fast: false + env: + PYTHON_VERSION: "3.11" steps: - uses: ./.github/workflows/molecule-template.yml molecule: From 85f7ec688969c25ed5a320bc35a831edac7e0790 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:33:44 -0500 Subject: [PATCH 15/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index 536399b..11996bc 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -2,6 +2,14 @@ name: Molecule Template on: workflow_call: +jobs: + molecule: + name: Molecule + runs-on: macos-12 + strategy: + fail-fast: false + env: + PYTHON_VERSION: "3.11" runs: using: "composite" steps: From bc6aa3219860c150cc7fa6967836072ff6621a55 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:35:35 -0500 Subject: [PATCH 16/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 9 ++++----- .github/workflows/test-ipv6.yml | 8 +++----- .github/workflows/test-single-node.yml | 8 +++----- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index f9c88df..a2a2240 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -7,13 +7,12 @@ jobs: name: Molecule runs-on: macos-12 strategy: + matrix: + scenario: + - default + fail-fast: false env: PYTHON_VERSION: "3.11" steps: - uses: ./.github/workflows/molecule-template.yml - molecule: - strategy: - matrix: - scenario: - - default diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index b99837d..56f6605 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -7,13 +7,11 @@ jobs: name: Molecule runs-on: macos-12 strategy: + matrix: + scenario: + - ipv6 fail-fast: false env: PYTHON_VERSION: "3.11" steps: - uses: ./.github/workflows/molecule-template.yml - molecule: - strategy: - matrix: - scenario: - - ipv6 diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index b7a9784..c06c503 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -7,13 +7,11 @@ jobs: name: Molecule runs-on: macos-12 strategy: + matrix: + scenario: + - single_node fail-fast: false env: PYTHON_VERSION: "3.11" steps: - uses: ./.github/workflows/molecule-template.yml - molecule: - strategy: - matrix: - scenario: - - single_node From 80fc191c20fda01461d170320a19d4440770d86b Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:36:36 -0500 Subject: [PATCH 17/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index a2a2240..0b72ca2 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -10,7 +10,6 @@ jobs: matrix: scenario: - default - fail-fast: false env: PYTHON_VERSION: "3.11" From 2490fecb69470c6c93a86117b71b2659c2036cb2 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:37:25 -0500 Subject: [PATCH 18/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index 0b72ca2..8cb80e3 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -13,5 +13,6 @@ jobs: fail-fast: false env: PYTHON_VERSION: "3.11" +runs: steps: - uses: ./.github/workflows/molecule-template.yml From 96b2d243ea1e0c97cdc3d0b34a1621ac1b62e62e Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:38:09 -0500 Subject: [PATCH 19/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index 8cb80e3..74a5133 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -13,6 +13,5 @@ jobs: fail-fast: false env: PYTHON_VERSION: "3.11" -runs: steps: - - uses: ./.github/workflows/molecule-template.yml + - uses: ./.github/workflows/molecule-template.yml From eb10968a75e88784a981e31143f85452adcbff1c Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:38:40 -0500 Subject: [PATCH 20/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index 74a5133..2ca4ffd 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -14,4 +14,4 @@ jobs: env: PYTHON_VERSION: "3.11" steps: - - uses: ./.github/workflows/molecule-template.yml + uses: ./.github/workflows/molecule-template.yml From 8c8ac8b9423a360b2239e7fa7806e6a9c1f7037c Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:40:22 -0500 Subject: [PATCH 21/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index 2ca4ffd..935c313 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -13,5 +13,5 @@ jobs: fail-fast: false env: PYTHON_VERSION: "3.11" - steps: - uses: ./.github/workflows/molecule-template.yml + steps: + uses: ./.github/workflows/molecule-template.yml From 4174e81e68348e3c87acfd16fedb30e3a411851d Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:40:45 -0500 Subject: [PATCH 22/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index 935c313..facbb4f 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -14,4 +14,4 @@ jobs: env: PYTHON_VERSION: "3.11" steps: - uses: ./.github/workflows/molecule-template.yml + - uses: ./.github/workflows/molecule-template.yml From edd2ba29cee7e050f9657f60e0ccdc140983a6a4 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:41:31 -0500 Subject: [PATCH 23/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-single-node.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index c06c503..8bd29b3 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -13,5 +13,5 @@ jobs: fail-fast: false env: PYTHON_VERSION: "3.11" - steps: - - uses: ./.github/workflows/molecule-template.yml + steps: + - uses: ./.github/workflows/molecule-template.yml From 3ff7547f8c3f02715c6a604b201e62f02fa10767 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:42:08 -0500 Subject: [PATCH 24/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-ipv6.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index 56f6605..9e6538c 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -13,5 +13,5 @@ jobs: fail-fast: false env: PYTHON_VERSION: "3.11" - steps: - - uses: ./.github/workflows/molecule-template.yml + steps: + - uses: ./.github/workflows/molecule-template.yml From 90fe88379ccfabc2a1a5bc0f396218370bc884d5 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:43:22 -0500 Subject: [PATCH 25/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index 11996bc..222f16a 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -10,8 +10,6 @@ jobs: fail-fast: false env: PYTHON_VERSION: "3.11" -runs: - using: "composite" steps: - name: Check out the codebase uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 From f52a556109929057a2b06eb09dfbca2955314cd4 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:44:22 -0500 Subject: [PATCH 26/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 128 ++++++++++++------------ 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index 222f16a..d179588 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -10,77 +10,77 @@ jobs: fail-fast: false env: PYTHON_VERSION: "3.11" - steps: - - name: Check out the codebase - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 - with: - ref: ${{ github.event.pull_request.head.sha }} + steps: + - name: Check out the codebase + uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + with: + ref: ${{ github.event.pull_request.head.sha }} - - name: Configure VirtualBox - run: |- - sudo mkdir -p /etc/vbox - cat < /dev/null - * 192.168.30.0/24 - * fdad:bad:ba55::/64 - EOF + - name: Configure VirtualBox + run: |- + sudo mkdir -p /etc/vbox + cat < /dev/null + * 192.168.30.0/24 + * fdad:bad:ba55::/64 + EOF - - name: Cache pip - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- + - name: Cache pip + uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }} + restore-keys: | + ${{ runner.os }}-pip- - - name: Cache Vagrant boxes - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 - with: - path: | - ~/.vagrant.d/boxes - key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }} - restore-keys: | - vagrant-boxes + - name: Cache Vagrant boxes + uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + with: + path: | + ~/.vagrant.d/boxes + key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }} + restore-keys: | + vagrant-boxes - - name: Download Vagrant boxes for all scenarios - # To save some cache space, all scenarios share the same cache key. - # On the other hand, this means that the cache contents should be - # the same across all scenarios. This step ensures that. - run: ./.github/download-boxes.sh + - name: Download Vagrant boxes for all scenarios + # To save some cache space, all scenarios share the same cache key. + # On the other hand, this means that the cache contents should be + # the same across all scenarios. This step ensures that. + run: ./.github/download-boxes.sh - - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3 - with: - python-version: ${{ env.PYTHON_VERSION }} - cache: 'pip' # caching pip dependencies + - name: Set up Python ${{ env.PYTHON_VERSION }} + uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3 + with: + python-version: ${{ env.PYTHON_VERSION }} + cache: 'pip' # caching pip dependencies - - name: Install dependencies - run: | - echo "::group::Upgrade pip" - python3 -m pip install --upgrade pip - echo "::endgroup::" + - name: Install dependencies + run: | + echo "::group::Upgrade pip" + python3 -m pip install --upgrade pip + echo "::endgroup::" - echo "::group::Install Python requirements from requirements.txt" - python3 -m pip install -r requirements.txt - echo "::endgroup::" + echo "::group::Install Python requirements from requirements.txt" + python3 -m pip install -r requirements.txt + echo "::endgroup::" - - name: Test with molecule - run: molecule test --scenario-name ${{ matrix.scenario }} - timeout-minutes: 90 - env: - ANSIBLE_K3S_LOG_DIR: ${{ runner.temp }}/logs/k3s-ansible/${{ matrix.scenario }} - ANSIBLE_SSH_RETRIES: 4 - ANSIBLE_TIMEOUT: 60 - PY_COLORS: 1 - ANSIBLE_FORCE_COLOR: 1 + - name: Test with molecule + run: molecule test --scenario-name ${{ matrix.scenario }} + timeout-minutes: 90 + env: + ANSIBLE_K3S_LOG_DIR: ${{ runner.temp }}/logs/k3s-ansible/${{ matrix.scenario }} + ANSIBLE_SSH_RETRIES: 4 + ANSIBLE_TIMEOUT: 60 + PY_COLORS: 1 + ANSIBLE_FORCE_COLOR: 1 - - name: Upload log files - if: always() # do this even if a step before has failed - uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # 3.1.1 - with: - name: logs - path: | - ${{ runner.temp }}/logs + - name: Upload log files + if: always() # do this even if a step before has failed + uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # 3.1.1 + with: + name: logs + path: | + ${{ runner.temp }}/logs - - name: Delete old box versions - if: always() # do this even if a step before has failed - run: vagrant box prune --force + - name: Delete old box versions + if: always() # do this even if a step before has failed + run: vagrant box prune --force From 4bb58181e837f3e4702c530bf8ed16b051836f68 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:47:52 -0500 Subject: [PATCH 27/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 5 +++++ .github/workflows/test-ipv6.yml | 5 +++++ .github/workflows/test-single-node.yml | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index facbb4f..b0d5447 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -14,4 +14,9 @@ jobs: env: PYTHON_VERSION: "3.11" steps: + - name: Check out the codebase + uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + with: + ref: ${{ github.event.pull_request.head.sha }} + - uses: ./.github/workflows/molecule-template.yml diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index 9e6538c..142620d 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -14,4 +14,9 @@ jobs: env: PYTHON_VERSION: "3.11" steps: + - name: Check out the codebase + uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + with: + ref: ${{ github.event.pull_request.head.sha }} + - uses: ./.github/workflows/molecule-template.yml diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index 8bd29b3..9bb38f7 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -14,4 +14,9 @@ jobs: env: PYTHON_VERSION: "3.11" steps: + - name: Check out the codebase + uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + with: + ref: ${{ github.event.pull_request.head.sha }} + - uses: ./.github/workflows/molecule-template.yml From 0874e5604580f5b426c15687bd83fa525799d8c1 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:53:58 -0500 Subject: [PATCH 28/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index b0d5447..f251573 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -19,4 +19,4 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/workflows/molecule-template.yml + - uses: .github/workflows/molecule-template.yml From 2884d54e6bfe5f9c6c811bea80ee51e12e55bfef Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:55:09 -0500 Subject: [PATCH 29/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index f251573..da8c92d 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -19,4 +19,4 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: .github/workflows/molecule-template.yml + - uses: "".github/workflows/molecule-template.yml" From fc88777e164154e11f5a6281ec4e89ef67964f6c Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:55:34 -0500 Subject: [PATCH 30/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index da8c92d..b5af7dc 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -19,4 +19,4 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: "".github/workflows/molecule-template.yml" + - uses: ".github/workflows/molecule-template.yml" From 4450075425b0334f27141ba74e4b9b6cea2d3bd3 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:56:11 -0500 Subject: [PATCH 31/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index b5af7dc..e98dc56 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -19,4 +19,4 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ".github/workflows/molecule-template.yml" + - uses: "./.github/workflows/molecule-template.yml" From 015e91bca99a240bc4e8a53f3702e3abf30fe643 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 13:58:32 -0500 Subject: [PATCH 32/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index e98dc56..437e584 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -14,9 +14,5 @@ jobs: env: PYTHON_VERSION: "3.11" steps: - - name: Check out the codebase - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 - with: - ref: ${{ github.event.pull_request.head.sha }} - + - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 - uses: "./.github/workflows/molecule-template.yml" From 7404865bd7062ccc8cb259791a98f381b6992aac Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:01:43 -0500 Subject: [PATCH 33/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index 437e584..f599a05 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -14,5 +14,11 @@ jobs: env: PYTHON_VERSION: "3.11" steps: - - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + - name: Check out the codebase + uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + with: + ref: ${{ github.event.pull_request.head.sha }} + - uses: "./.github/workflows/molecule-template.yml" + with: + ref: ${{ github.event.pull_request.head.sha }} From c9a96de15b5fc13e65bd3a9118bedba42a734d40 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:04:29 -0500 Subject: [PATCH 34/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 8 ++++---- .github/workflows/test-default.yml | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index d179588..c754195 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -11,10 +11,10 @@ jobs: env: PYTHON_VERSION: "3.11" steps: - - name: Check out the codebase - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 - with: - ref: ${{ github.event.pull_request.head.sha }} + # - name: Check out the codebase + # uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + # with: + # ref: ${{ github.event.pull_request.head.sha }} - name: Configure VirtualBox run: |- diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index f599a05..ba2450d 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -18,7 +18,4 @@ jobs: uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 with: ref: ${{ github.event.pull_request.head.sha }} - - - uses: "./.github/workflows/molecule-template.yml" - with: - ref: ${{ github.event.pull_request.head.sha }} + - uses: ./.github/workflows/molecule-template.yml From f54f180997d220f0b168ac1b8e2929b8a00bd0ae Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:10:04 -0500 Subject: [PATCH 35/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 8 ++++---- .github/workflows/test-default.yml | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index c754195..d179588 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -11,10 +11,10 @@ jobs: env: PYTHON_VERSION: "3.11" steps: - # - name: Check out the codebase - # uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 - # with: - # ref: ${{ github.event.pull_request.head.sha }} + - name: Check out the codebase + uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + with: + ref: ${{ github.event.pull_request.head.sha }} - name: Configure VirtualBox run: |- diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index ba2450d..4afc6d2 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -13,9 +13,10 @@ jobs: fail-fast: false env: PYTHON_VERSION: "3.11" + steps: + - name: Check out the codebase + uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + with: + ref: ${{ github.event.pull_request.head.sha }}\ steps: - - name: Check out the codebase - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 - with: - ref: ${{ github.event.pull_request.head.sha }} - uses: ./.github/workflows/molecule-template.yml From 4d6dc254f3c14e413f78676c66a24b04ecefe1d6 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:11:48 -0500 Subject: [PATCH 36/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index 4afc6d2..d43f559 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -13,10 +13,9 @@ jobs: fail-fast: false env: PYTHON_VERSION: "3.11" - steps: - - name: Check out the codebase - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 - with: - ref: ${{ github.event.pull_request.head.sha }}\ + - uses: ./.github/workflows/molecule-template.yml steps: - - uses: ./.github/workflows/molecule-template.yml + - name: Check out the codebase + uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + with: + ref: ${{ github.event.pull_request.head.sha }} From 207b8f6f88aa5b72c46c20beecd4bd78df9e6d55 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:16:09 -0500 Subject: [PATCH 37/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index d43f559..42a2a34 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -1,7 +1,7 @@ --- name: Test Default on: - workflow_call: + workflow_dispatch: jobs: molecule: name: Molecule @@ -13,9 +13,9 @@ jobs: fail-fast: false env: PYTHON_VERSION: "3.11" - - uses: ./.github/workflows/molecule-template.yml steps: - name: Check out the codebase uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 with: ref: ${{ github.event.pull_request.head.sha }} + - uses: ./.github/workflows/molecule-template.yml From 8637027635694dd90ea9171497f18a97683c3adf Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:19:14 -0500 Subject: [PATCH 38/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 2 +- .github/workflows/test-default.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index d179588..023c800 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -1,7 +1,7 @@ --- name: Molecule Template on: - workflow_call: + workflow_dispatch: jobs: molecule: name: Molecule diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index 42a2a34..ba2450d 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -1,7 +1,7 @@ --- name: Test Default on: - workflow_dispatch: + workflow_call: jobs: molecule: name: Molecule From 856015d127e0c8a170f692885502ab215ec62a94 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:26:53 -0500 Subject: [PATCH 39/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 2 +- .github/workflows/test-default.yml | 27 ++++++++----------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index 023c800..d179588 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -1,7 +1,7 @@ --- name: Molecule Template on: - workflow_dispatch: + workflow_call: jobs: molecule: name: Molecule diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index ba2450d..e3f56fe 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -1,21 +1,10 @@ --- name: Test Default -on: - workflow_call: -jobs: - molecule: - name: Molecule - runs-on: macos-12 - strategy: - matrix: - scenario: - - default - fail-fast: false - env: - PYTHON_VERSION: "3.11" - steps: - - name: Check out the codebase - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 - with: - ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/workflows/molecule-template.yml +runs: + using: "composite" + steps: + - name: Check out the codebase + uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + with: + ref: ${{ github.event.pull_request.head.sha }} + - uses: ./.github/workflows/molecule-template.yml From c6a20c7f148758aa06e08629c48fcdb837d5b3f8 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:27:20 -0500 Subject: [PATCH 40/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index e3f56fe..185afe4 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -1,10 +1,12 @@ --- name: Test Default -runs: - using: "composite" - steps: - - name: Check out the codebase - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 - with: - ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/workflows/molecule-template.yml +on: + workflow_call: + runs: + using: "composite" + steps: + - name: Check out the codebase + uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + with: + ref: ${{ github.event.pull_request.head.sha }} + - uses: ./.github/workflows/molecule-template.yml From 06d4773e425f22585553c85ada80684bebec7da6 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:27:51 -0500 Subject: [PATCH 41/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index 185afe4..b96ce15 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -2,11 +2,11 @@ name: Test Default on: workflow_call: - runs: - using: "composite" - steps: - - name: Check out the codebase - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 - with: - ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/workflows/molecule-template.yml +runs: + using: "composite" + steps: + - name: Check out the codebase + uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + with: + ref: ${{ github.event.pull_request.head.sha }} + - uses: ./.github/workflows/molecule-template.yml From 26aa538e5fcc3b7dc534a09b82b9298f0b64a588 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:28:36 -0500 Subject: [PATCH 42/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index b96ce15..e3f56fe 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -1,7 +1,5 @@ --- name: Test Default -on: - workflow_call: runs: using: "composite" steps: From 22c1bccd1366eae0c73b1a5286f8145524da22a3 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:30:22 -0500 Subject: [PATCH 43/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 144 ++++++++++++------------ .github/workflows/test-default.yml | 4 +- 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index d179588..b99d2ae 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -2,85 +2,85 @@ name: Molecule Template on: workflow_call: -jobs: - molecule: - name: Molecule - runs-on: macos-12 - strategy: - fail-fast: false - env: - PYTHON_VERSION: "3.11" - steps: - - name: Check out the codebase - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 - with: - ref: ${{ github.event.pull_request.head.sha }} +runs: + using: "composite" + name: Molecule + runs-on: macos-12 + strategy: + fail-fast: false + env: + PYTHON_VERSION: "3.11" + steps: + - name: Check out the codebase + uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + with: + ref: ${{ github.event.pull_request.head.sha }} - - name: Configure VirtualBox - run: |- - sudo mkdir -p /etc/vbox - cat < /dev/null - * 192.168.30.0/24 - * fdad:bad:ba55::/64 - EOF + - name: Configure VirtualBox + run: |- + sudo mkdir -p /etc/vbox + cat < /dev/null + * 192.168.30.0/24 + * fdad:bad:ba55::/64 + EOF - - name: Cache pip - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- + - name: Cache pip + uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }} + restore-keys: | + ${{ runner.os }}-pip- - - name: Cache Vagrant boxes - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 - with: - path: | - ~/.vagrant.d/boxes - key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }} - restore-keys: | - vagrant-boxes + - name: Cache Vagrant boxes + uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + with: + path: | + ~/.vagrant.d/boxes + key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }} + restore-keys: | + vagrant-boxes - - name: Download Vagrant boxes for all scenarios - # To save some cache space, all scenarios share the same cache key. - # On the other hand, this means that the cache contents should be - # the same across all scenarios. This step ensures that. - run: ./.github/download-boxes.sh + - name: Download Vagrant boxes for all scenarios + # To save some cache space, all scenarios share the same cache key. + # On the other hand, this means that the cache contents should be + # the same across all scenarios. This step ensures that. + run: ./.github/download-boxes.sh - - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3 - with: - python-version: ${{ env.PYTHON_VERSION }} - cache: 'pip' # caching pip dependencies + - name: Set up Python ${{ env.PYTHON_VERSION }} + uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3 + with: + python-version: ${{ env.PYTHON_VERSION }} + cache: 'pip' # caching pip dependencies - - name: Install dependencies - run: | - echo "::group::Upgrade pip" - python3 -m pip install --upgrade pip - echo "::endgroup::" + - name: Install dependencies + run: | + echo "::group::Upgrade pip" + python3 -m pip install --upgrade pip + echo "::endgroup::" - echo "::group::Install Python requirements from requirements.txt" - python3 -m pip install -r requirements.txt - echo "::endgroup::" + echo "::group::Install Python requirements from requirements.txt" + python3 -m pip install -r requirements.txt + echo "::endgroup::" - - name: Test with molecule - run: molecule test --scenario-name ${{ matrix.scenario }} - timeout-minutes: 90 - env: - ANSIBLE_K3S_LOG_DIR: ${{ runner.temp }}/logs/k3s-ansible/${{ matrix.scenario }} - ANSIBLE_SSH_RETRIES: 4 - ANSIBLE_TIMEOUT: 60 - PY_COLORS: 1 - ANSIBLE_FORCE_COLOR: 1 + - name: Test with molecule + run: molecule test --scenario-name ${{ matrix.scenario }} + timeout-minutes: 90 + env: + ANSIBLE_K3S_LOG_DIR: ${{ runner.temp }}/logs/k3s-ansible/${{ matrix.scenario }} + ANSIBLE_SSH_RETRIES: 4 + ANSIBLE_TIMEOUT: 60 + PY_COLORS: 1 + ANSIBLE_FORCE_COLOR: 1 - - name: Upload log files - if: always() # do this even if a step before has failed - uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # 3.1.1 - with: - name: logs - path: | - ${{ runner.temp }}/logs + - name: Upload log files + if: always() # do this even if a step before has failed + uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # 3.1.1 + with: + name: logs + path: | + ${{ runner.temp }}/logs - - name: Delete old box versions - if: always() # do this even if a step before has failed - run: vagrant box prune --force + - name: Delete old box versions + if: always() # do this even if a step before has failed + run: vagrant box prune --force diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index e3f56fe..6e7c427 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -1,7 +1,7 @@ --- name: Test Default -runs: - using: "composite" +jobs: + molecule: steps: - name: Check out the codebase uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 From 841e9244491cf20e5688188c388c44fbb9373ce6 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:32:27 -0500 Subject: [PATCH 44/59] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 86 ----------------------- .github/workflows/test-default.yml | 93 +++++++++++++++++++++++-- .github/workflows/test-ipv6.yml | 71 ++++++++++++++++++- .github/workflows/test-single-node.yml | 71 ++++++++++++++++++- 4 files changed, 224 insertions(+), 97 deletions(-) delete mode 100644 .github/workflows/molecule-template.yml diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml deleted file mode 100644 index b99d2ae..0000000 --- a/.github/workflows/molecule-template.yml +++ /dev/null @@ -1,86 +0,0 @@ ---- -name: Molecule Template -on: - workflow_call: -runs: - using: "composite" - name: Molecule - runs-on: macos-12 - strategy: - fail-fast: false - env: - PYTHON_VERSION: "3.11" - steps: - - name: Check out the codebase - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 - with: - ref: ${{ github.event.pull_request.head.sha }} - - - name: Configure VirtualBox - run: |- - sudo mkdir -p /etc/vbox - cat < /dev/null - * 192.168.30.0/24 - * fdad:bad:ba55::/64 - EOF - - - name: Cache pip - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- - - - name: Cache Vagrant boxes - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 - with: - path: | - ~/.vagrant.d/boxes - key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }} - restore-keys: | - vagrant-boxes - - - name: Download Vagrant boxes for all scenarios - # To save some cache space, all scenarios share the same cache key. - # On the other hand, this means that the cache contents should be - # the same across all scenarios. This step ensures that. - run: ./.github/download-boxes.sh - - - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3 - with: - python-version: ${{ env.PYTHON_VERSION }} - cache: 'pip' # caching pip dependencies - - - name: Install dependencies - run: | - echo "::group::Upgrade pip" - python3 -m pip install --upgrade pip - echo "::endgroup::" - - echo "::group::Install Python requirements from requirements.txt" - python3 -m pip install -r requirements.txt - echo "::endgroup::" - - - name: Test with molecule - run: molecule test --scenario-name ${{ matrix.scenario }} - timeout-minutes: 90 - env: - ANSIBLE_K3S_LOG_DIR: ${{ runner.temp }}/logs/k3s-ansible/${{ matrix.scenario }} - ANSIBLE_SSH_RETRIES: 4 - ANSIBLE_TIMEOUT: 60 - PY_COLORS: 1 - ANSIBLE_FORCE_COLOR: 1 - - - name: Upload log files - if: always() # do this even if a step before has failed - uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # 3.1.1 - with: - name: logs - path: | - ${{ runner.temp }}/logs - - - name: Delete old box versions - if: always() # do this even if a step before has failed - run: vagrant box prune --force diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index 6e7c427..e8b315f 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -1,10 +1,89 @@ --- -name: Test Default +name: Molecule Template +on: + workflow_call: jobs: molecule: - steps: - - name: Check out the codebase - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 - with: - ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/workflows/molecule-template.yml + name: Molecule + runs-on: macos-12 + strategy: + matrix: + scenario: + - default + fail-fast: false + env: + PYTHON_VERSION: "3.11" + steps: + - name: Check out the codebase + uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + with: + ref: ${{ github.event.pull_request.head.sha }} + + - name: Configure VirtualBox + run: |- + sudo mkdir -p /etc/vbox + cat < /dev/null + * 192.168.30.0/24 + * fdad:bad:ba55::/64 + EOF + + - name: Cache pip + uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }} + restore-keys: | + ${{ runner.os }}-pip- + + - name: Cache Vagrant boxes + uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + with: + path: | + ~/.vagrant.d/boxes + key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }} + restore-keys: | + vagrant-boxes + + - name: Download Vagrant boxes for all scenarios + # To save some cache space, all scenarios share the same cache key. + # On the other hand, this means that the cache contents should be + # the same across all scenarios. This step ensures that. + run: ./.github/download-boxes.sh + + - name: Set up Python ${{ env.PYTHON_VERSION }} + uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3 + with: + python-version: ${{ env.PYTHON_VERSION }} + cache: 'pip' # caching pip dependencies + + - name: Install dependencies + run: | + echo "::group::Upgrade pip" + python3 -m pip install --upgrade pip + echo "::endgroup::" + + echo "::group::Install Python requirements from requirements.txt" + python3 -m pip install -r requirements.txt + echo "::endgroup::" + + - name: Test with molecule + run: molecule test --scenario-name ${{ matrix.scenario }} + timeout-minutes: 90 + env: + ANSIBLE_K3S_LOG_DIR: ${{ runner.temp }}/logs/k3s-ansible/${{ matrix.scenario }} + ANSIBLE_SSH_RETRIES: 4 + ANSIBLE_TIMEOUT: 60 + PY_COLORS: 1 + ANSIBLE_FORCE_COLOR: 1 + + - name: Upload log files + if: always() # do this even if a step before has failed + uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # 3.1.1 + with: + name: logs + path: | + ${{ runner.temp }}/logs + + - name: Delete old box versions + if: always() # do this even if a step before has failed + run: vagrant box prune --force diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index 142620d..2056d90 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -1,5 +1,5 @@ --- -name: Test IPv6 +name: Molecule Template on: workflow_call: jobs: @@ -19,4 +19,71 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/workflows/molecule-template.yml + - name: Configure VirtualBox + run: |- + sudo mkdir -p /etc/vbox + cat < /dev/null + * 192.168.30.0/24 + * fdad:bad:ba55::/64 + EOF + + - name: Cache pip + uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }} + restore-keys: | + ${{ runner.os }}-pip- + + - name: Cache Vagrant boxes + uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + with: + path: | + ~/.vagrant.d/boxes + key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }} + restore-keys: | + vagrant-boxes + + - name: Download Vagrant boxes for all scenarios + # To save some cache space, all scenarios share the same cache key. + # On the other hand, this means that the cache contents should be + # the same across all scenarios. This step ensures that. + run: ./.github/download-boxes.sh + + - name: Set up Python ${{ env.PYTHON_VERSION }} + uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3 + with: + python-version: ${{ env.PYTHON_VERSION }} + cache: 'pip' # caching pip dependencies + + - name: Install dependencies + run: | + echo "::group::Upgrade pip" + python3 -m pip install --upgrade pip + echo "::endgroup::" + + echo "::group::Install Python requirements from requirements.txt" + python3 -m pip install -r requirements.txt + echo "::endgroup::" + + - name: Test with molecule + run: molecule test --scenario-name ${{ matrix.scenario }} + timeout-minutes: 90 + env: + ANSIBLE_K3S_LOG_DIR: ${{ runner.temp }}/logs/k3s-ansible/${{ matrix.scenario }} + ANSIBLE_SSH_RETRIES: 4 + ANSIBLE_TIMEOUT: 60 + PY_COLORS: 1 + ANSIBLE_FORCE_COLOR: 1 + + - name: Upload log files + if: always() # do this even if a step before has failed + uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # 3.1.1 + with: + name: logs + path: | + ${{ runner.temp }}/logs + + - name: Delete old box versions + if: always() # do this even if a step before has failed + run: vagrant box prune --force diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index 9bb38f7..4cee49c 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -1,5 +1,5 @@ --- -name: Test Single Node +name: Molecule Template on: workflow_call: jobs: @@ -19,4 +19,71 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/workflows/molecule-template.yml + - name: Configure VirtualBox + run: |- + sudo mkdir -p /etc/vbox + cat < /dev/null + * 192.168.30.0/24 + * fdad:bad:ba55::/64 + EOF + + - name: Cache pip + uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }} + restore-keys: | + ${{ runner.os }}-pip- + + - name: Cache Vagrant boxes + uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + with: + path: | + ~/.vagrant.d/boxes + key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }} + restore-keys: | + vagrant-boxes + + - name: Download Vagrant boxes for all scenarios + # To save some cache space, all scenarios share the same cache key. + # On the other hand, this means that the cache contents should be + # the same across all scenarios. This step ensures that. + run: ./.github/download-boxes.sh + + - name: Set up Python ${{ env.PYTHON_VERSION }} + uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3 + with: + python-version: ${{ env.PYTHON_VERSION }} + cache: 'pip' # caching pip dependencies + + - name: Install dependencies + run: | + echo "::group::Upgrade pip" + python3 -m pip install --upgrade pip + echo "::endgroup::" + + echo "::group::Install Python requirements from requirements.txt" + python3 -m pip install -r requirements.txt + echo "::endgroup::" + + - name: Test with molecule + run: molecule test --scenario-name ${{ matrix.scenario }} + timeout-minutes: 90 + env: + ANSIBLE_K3S_LOG_DIR: ${{ runner.temp }}/logs/k3s-ansible/${{ matrix.scenario }} + ANSIBLE_SSH_RETRIES: 4 + ANSIBLE_TIMEOUT: 60 + PY_COLORS: 1 + ANSIBLE_FORCE_COLOR: 1 + + - name: Upload log files + if: always() # do this even if a step before has failed + uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # 3.1.1 + with: + name: logs + path: | + ${{ runner.temp }}/logs + + - name: Delete old box versions + if: always() # do this even if a step before has failed + run: vagrant box prune --force From 0c3d5e9a29c567c72b0a09f4f6aa7433d936b165 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:37:19 -0500 Subject: [PATCH 45/59] fix(CI): Break up workflows and use templates --- .github/workflows/ci.yml | 4 ++-- .github/workflows/test-default.yml | 1 + .github/workflows/test-ipv6.yml | 1 + .github/workflows/test-single-node.yml | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d8ecde..1293956 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: needs: [lint] test-ipv6: uses: ./.github/workflows/test-ipv6.yml - needs: [lint] + needs: [lint,test-default] test-single-node: uses: ./.github/workflows/test-single-node.yml - needs: [lint] + needs: [lint,test-default,test-ipv6] diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index e8b315f..d64ea9c 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -1,5 +1,6 @@ --- name: Molecule Template +concurrency: github_ci on: workflow_call: jobs: diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index 2056d90..63f6402 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -1,5 +1,6 @@ --- name: Molecule Template +concurrency: github_ci on: workflow_call: jobs: diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index 4cee49c..aace75f 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -1,5 +1,6 @@ --- name: Molecule Template +concurrency: github_ci on: workflow_call: jobs: From 0cb638faf1c06a4f5c75db59582ca324e1b6aed0 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:39:50 -0500 Subject: [PATCH 46/59] fix(CI): Break up workflows and use templates --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1293956..9c16867 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: needs: [lint] test-ipv6: uses: ./.github/workflows/test-ipv6.yml - needs: [lint,test-default] + needs: [lint, test-default] test-single-node: uses: ./.github/workflows/test-single-node.yml - needs: [lint,test-default,test-ipv6] + needs: [lint, test-default, test-ipv6] From d767e6add055993b5f54c7ff3ac0e1927f32f420 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:40:50 -0500 Subject: [PATCH 47/59] fix(CI): Break up workflows and use templates --- .github/workflows/ci.yml | 1 + .github/workflows/lint.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c16867..55a376c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,6 @@ --- name: "CI" +concurrency: github_ci on: pull_request: push: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b43f5bb..7fd7e33 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,5 +1,6 @@ --- name: Linting +concurrency: github_ci on: workflow_call: jobs: From f89eb5ec077294366fa185b6a0fcd865cb1dcd3a Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:55:40 -0500 Subject: [PATCH 48/59] fix(CI): Break up workflows and use templates --- .github/workflows/lint.yml | 8 ++++---- .github/workflows/test-default.yml | 6 +++--- .github/workflows/test-ipv6.yml | 6 +++--- .github/workflows/test-single-node.yml | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7fd7e33..4c3a25f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Check out the codebase - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1 with: ref: ${{ github.event.pull_request.head.sha }} @@ -23,7 +23,7 @@ jobs: cache: 'pip' # caching pip dependencies - name: Cache pip - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # 3.3.2 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }} @@ -31,7 +31,7 @@ jobs: ${{ runner.os }}-pip- - name: Cache Ansible - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # 3.3.2 with: path: ~/.ansible/collections key: ${{ runner.os }}-ansible-${{ hashFiles('collections/requirements.txt') }} @@ -60,7 +60,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1 - name: Ensure SHA pinned actions uses: zgosalvez/github-actions-ensure-sha-pinned-actions@af2eb3226618e2494e3d9084f515ad6dcf16e229 # 2.0.1 with: diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index d64ea9c..cfbb453 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -16,7 +16,7 @@ jobs: PYTHON_VERSION: "3.11" steps: - name: Check out the codebase - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1 with: ref: ${{ github.event.pull_request.head.sha }} @@ -29,7 +29,7 @@ jobs: EOF - name: Cache pip - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # 3.3.2 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }} @@ -37,7 +37,7 @@ jobs: ${{ runner.os }}-pip- - name: Cache Vagrant boxes - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # 3.3.2 with: path: | ~/.vagrant.d/boxes diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index 63f6402..534d5fd 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -16,7 +16,7 @@ jobs: PYTHON_VERSION: "3.11" steps: - name: Check out the codebase - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1 with: ref: ${{ github.event.pull_request.head.sha }} @@ -29,7 +29,7 @@ jobs: EOF - name: Cache pip - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # 3.3.2 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }} @@ -37,7 +37,7 @@ jobs: ${{ runner.os }}-pip- - name: Cache Vagrant boxes - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # 3.3.2 with: path: | ~/.vagrant.d/boxes diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index aace75f..c7d129f 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -16,7 +16,7 @@ jobs: PYTHON_VERSION: "3.11" steps: - name: Check out the codebase - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1 with: ref: ${{ github.event.pull_request.head.sha }} @@ -29,7 +29,7 @@ jobs: EOF - name: Cache pip - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # 3.3.2 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }} @@ -37,7 +37,7 @@ jobs: ${{ runner.os }}-pip- - name: Cache Vagrant boxes - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # 3.3.2 with: path: | ~/.vagrant.d/boxes From 926b2452813dd277b579f86db51e8cc839d98fb4 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:57:10 -0500 Subject: [PATCH 49/59] fix(CI): Break up workflows and use templates --- .github/workflows/lint.yml | 2 +- .github/workflows/test-default.yml | 2 +- .github/workflows/test-ipv6.yml | 2 +- .github/workflows/test-single-node.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4c3a25f..3580c5c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,7 +17,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3 + uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # 4.7.1 with: python-version: ${{ env.PYTHON_VERSION }} cache: 'pip' # caching pip dependencies diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index cfbb453..a8c174a 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -52,7 +52,7 @@ jobs: run: ./.github/download-boxes.sh - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3 + uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # 4.7.1 with: python-version: ${{ env.PYTHON_VERSION }} cache: 'pip' # caching pip dependencies diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index 534d5fd..ccc2118 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -52,7 +52,7 @@ jobs: run: ./.github/download-boxes.sh - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3 + uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # 4.7.1 with: python-version: ${{ env.PYTHON_VERSION }} cache: 'pip' # caching pip dependencies diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index c7d129f..722068e 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -52,7 +52,7 @@ jobs: run: ./.github/download-boxes.sh - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3 + uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # 4.7.1 with: python-version: ${{ env.PYTHON_VERSION }} cache: 'pip' # caching pip dependencies From 9593ae69ef3ea538c275d0aef978d374db8c7c05 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:57:58 -0500 Subject: [PATCH 50/59] fix(CI): Break up workflows and use templates --- .github/workflows/ci.yml | 1 - .github/workflows/lint.yml | 1 - .github/workflows/test-default.yml | 1 - .github/workflows/test-ipv6.yml | 1 - .github/workflows/test-single-node.yml | 1 - 5 files changed, 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55a376c..9c16867 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,5 @@ --- name: "CI" -concurrency: github_ci on: pull_request: push: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3580c5c..c961967 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,6 +1,5 @@ --- name: Linting -concurrency: github_ci on: workflow_call: jobs: diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index a8c174a..f167bf3 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -1,6 +1,5 @@ --- name: Molecule Template -concurrency: github_ci on: workflow_call: jobs: diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index ccc2118..5a6e1c0 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -1,6 +1,5 @@ --- name: Molecule Template -concurrency: github_ci on: workflow_call: jobs: diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index 722068e..16c4830 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -1,6 +1,5 @@ --- name: Molecule Template -concurrency: github_ci on: workflow_call: jobs: From 6ca0dcecaeed7c7de1aa49f25d9057a094c11958 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 15:00:37 -0500 Subject: [PATCH 51/59] fix(CI): Break up workflows and use templates --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c961967..cbfbb2d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -59,7 +59,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1 + uses: actions/checkout@f32435541e24cd6a4700a7f52bb2ec59e80603b1 # 2.1.4 - name: Ensure SHA pinned actions uses: zgosalvez/github-actions-ensure-sha-pinned-actions@af2eb3226618e2494e3d9084f515ad6dcf16e229 # 2.0.1 with: From 4066ca7b6c5b383bbf412eb2eb11fae69143ad1f Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 15:03:05 -0500 Subject: [PATCH 52/59] fix(CI): Break up workflows and use templates --- .github/workflows/lint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cbfbb2d..eab7c80 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -59,9 +59,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@f32435541e24cd6a4700a7f52bb2ec59e80603b1 # 2.1.4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1 - name: Ensure SHA pinned actions - uses: zgosalvez/github-actions-ensure-sha-pinned-actions@af2eb3226618e2494e3d9084f515ad6dcf16e229 # 2.0.1 + uses: zgosalvez/github-actions-ensure-sha-pinned-actions@f32435541e24cd6a4700a7f52bb2ec59e80603b1 # 2.0.1 with: allowlist: | aws-actions/ From 71821b2be3da33776fc63435515934777162addb Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 15:22:05 -0500 Subject: [PATCH 53/59] fix(CI): Break up workflows and use templates --- .github/workflows/test-default.yml | 4 +- .github/workflows/test-ipv6.yml | 4 +- .github/workflows/test-single-node.yml | 4 +- requirements.txt | 135 ++++++++++++------------- 4 files changed, 72 insertions(+), 75 deletions(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index f167bf3..e6c067d 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -1,5 +1,5 @@ --- -name: Molecule Template +name: Molecule Default on: workflow_call: jobs: @@ -78,7 +78,7 @@ jobs: - name: Upload log files if: always() # do this even if a step before has failed - uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # 3.1.1 + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # 3.1.3 with: name: logs path: | diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index 5a6e1c0..bf4eb2c 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -1,5 +1,5 @@ --- -name: Molecule Template +name: Molecule IPv6 on: workflow_call: jobs: @@ -78,7 +78,7 @@ jobs: - name: Upload log files if: always() # do this even if a step before has failed - uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # 3.1.1 + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # 3.1.3 with: name: logs path: | diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index 16c4830..de2cdc1 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -1,5 +1,5 @@ --- -name: Molecule Template +name: Molecule Single Node on: workflow_call: jobs: @@ -78,7 +78,7 @@ jobs: - name: Upload log files if: always() # do this even if a step before has failed - uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # 3.1.1 + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # 3.1.3 with: name: logs path: | diff --git a/requirements.txt b/requirements.txt index 30cb1d4..4d15cc3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,129 +2,119 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile requirements.in +# pip-compile # -ansible-compat==3.0.1 +ansible-compat==4.1.10 # via molecule -ansible-core==2.15.4 +ansible-core==2.15.5 # via # -r requirements.in # ansible-compat -arrow==1.2.3 - # via jinja2-time -attrs==22.1.0 - # via jsonschema -binaryornot==0.4.4 - # via cookiecutter -cachetools==5.2.0 + # molecule +attrs==23.1.0 + # via + # jsonschema + # referencing +bracex==2.4 + # via wcmatch +cachetools==5.3.2 # via google-auth -certifi==2022.9.24 +certifi==2023.7.22 # via # kubernetes # requests -cffi==1.15.1 +cffi==1.16.0 # via cryptography -cfgv==3.3.1 +cfgv==3.4.0 # via pre-commit -chardet==5.0.0 - # via binaryornot -charset-normalizer==2.1.1 +charset-normalizer==3.3.1 # via requests -click==8.1.3 +click==8.1.7 # via # click-help-colors - # cookiecutter # molecule -click-help-colors==0.9.1 +click-help-colors==0.9.2 # via molecule -commonmark==0.9.1 - # via rich -cookiecutter==2.1.1 - # via molecule -cryptography==38.0.3 +cryptography==41.0.5 # via ansible-core -distlib==0.3.6 +distlib==0.3.7 # via virtualenv distro==1.8.0 # via selinux enrich==1.2.7 # via molecule -filelock==3.8.0 +filelock==3.13.0 # via virtualenv -google-auth==2.14.0 +google-auth==2.23.3 # via kubernetes -identify==2.5.8 +identify==2.5.31 # via pre-commit idna==3.4 # via requests jinja2==3.1.2 # via # ansible-core - # cookiecutter - # jinja2-time # molecule # molecule-vagrant -jinja2-time==0.2.0 - # via cookiecutter jmespath==1.0.1 # via -r requirements.in jsonpatch==1.33 # via -r requirements.in -jsonpointer==2.3 +jsonpointer==2.4 # via jsonpatch -jsonschema==4.17.0 +jsonschema==4.19.1 # via # ansible-compat # molecule -kubernetes==25.3.0 +jsonschema-specifications==2023.7.1 + # via jsonschema +kubernetes==28.1.0 # via -r requirements.in -markupsafe==2.1.1 +markdown-it-py==3.0.0 + # via rich +markupsafe==2.1.3 # via jinja2 -molecule==4.0.4 +mdurl==0.1.2 + # via markdown-it-py +molecule==6.0.2 # via # -r requirements.in # molecule-vagrant -molecule-vagrant==1.0.0 +molecule-vagrant==2.0.0 # via -r requirements.in netaddr==0.9.0 # via -r requirements.in -nodeenv==1.7.0 +nodeenv==1.8.0 # via pre-commit oauthlib==3.2.2 - # via requests-oauthlib -packaging==21.3 + # via + # kubernetes + # requests-oauthlib +packaging==23.2 # via # ansible-compat # ansible-core # molecule -platformdirs==2.5.2 +platformdirs==3.11.0 # via virtualenv -pluggy==1.0.0 +pluggy==1.3.0 # via molecule -pre-commit==2.21.0 +pre-commit==3.5.0 # via -r requirements.in pre-commit-hooks==4.5.0 # via -r requirements.in -pyasn1==0.4.8 +pyasn1==0.5.0 # via # pyasn1-modules # rsa -pyasn1-modules==0.2.8 +pyasn1-modules==0.3.0 # via google-auth pycparser==2.21 # via cffi -pygments==2.13.0 +pygments==2.16.1 # via rich -pyparsing==3.0.9 - # via packaging -pyrsistent==0.19.2 - # via jsonschema python-dateutil==2.8.2 - # via - # arrow - # kubernetes -python-slugify==6.1.2 - # via cookiecutter + # via kubernetes python-vagrant==1.0.0 # via molecule-vagrant pyyaml==6.0.1 @@ -132,46 +122,53 @@ pyyaml==6.0.1 # -r requirements.in # ansible-compat # ansible-core - # cookiecutter # kubernetes # molecule # molecule-vagrant # pre-commit -requests==2.28.1 +referencing==0.30.2 + # via + # jsonschema + # jsonschema-specifications +requests==2.31.0 # via - # cookiecutter # kubernetes # requests-oauthlib requests-oauthlib==1.3.1 # via kubernetes -resolvelib==0.8.1 +resolvelib==1.0.1 # via ansible-core -rich==12.6.0 +rich==13.6.0 # via # enrich # molecule +rpds-py==0.10.6 + # via + # jsonschema + # referencing rsa==4.9 # via google-auth -ruamel-yaml==0.17.21 +ruamel-yaml==0.18.3 # via pre-commit-hooks -selinux==0.2.1 +ruamel-yaml-clib==0.2.8 + # via ruamel-yaml +selinux==0.3.0 # via molecule-vagrant six==1.16.0 # via - # google-auth # kubernetes # python-dateutil subprocess-tee==0.4.1 # via ansible-compat -text-unidecode==1.3 - # via python-slugify -urllib3==1.26.12 +urllib3==1.26.18 # via # kubernetes # requests -virtualenv==20.16.6 +virtualenv==20.24.6 # via pre-commit -websocket-client==1.4.2 +wcmatch==8.5 + # via molecule +websocket-client==1.6.4 # via kubernetes # The following packages are considered to be unsafe in a requirements file: From df99f988c5af76a7ae0f2df0b53a8b1f96e68968 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 15:29:25 -0500 Subject: [PATCH 54/59] fix(CI): Break up workflows and use templates --- requirements.txt | 135 ++++++++++++++++++++++++----------------------- 1 file changed, 69 insertions(+), 66 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4d15cc3..30cb1d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,119 +2,129 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile +# pip-compile requirements.in # -ansible-compat==4.1.10 +ansible-compat==3.0.1 # via molecule -ansible-core==2.15.5 +ansible-core==2.15.4 # via # -r requirements.in # ansible-compat - # molecule -attrs==23.1.0 - # via - # jsonschema - # referencing -bracex==2.4 - # via wcmatch -cachetools==5.3.2 +arrow==1.2.3 + # via jinja2-time +attrs==22.1.0 + # via jsonschema +binaryornot==0.4.4 + # via cookiecutter +cachetools==5.2.0 # via google-auth -certifi==2023.7.22 +certifi==2022.9.24 # via # kubernetes # requests -cffi==1.16.0 +cffi==1.15.1 # via cryptography -cfgv==3.4.0 +cfgv==3.3.1 # via pre-commit -charset-normalizer==3.3.1 +chardet==5.0.0 + # via binaryornot +charset-normalizer==2.1.1 # via requests -click==8.1.7 +click==8.1.3 # via # click-help-colors + # cookiecutter # molecule -click-help-colors==0.9.2 +click-help-colors==0.9.1 # via molecule -cryptography==41.0.5 +commonmark==0.9.1 + # via rich +cookiecutter==2.1.1 + # via molecule +cryptography==38.0.3 # via ansible-core -distlib==0.3.7 +distlib==0.3.6 # via virtualenv distro==1.8.0 # via selinux enrich==1.2.7 # via molecule -filelock==3.13.0 +filelock==3.8.0 # via virtualenv -google-auth==2.23.3 +google-auth==2.14.0 # via kubernetes -identify==2.5.31 +identify==2.5.8 # via pre-commit idna==3.4 # via requests jinja2==3.1.2 # via # ansible-core + # cookiecutter + # jinja2-time # molecule # molecule-vagrant +jinja2-time==0.2.0 + # via cookiecutter jmespath==1.0.1 # via -r requirements.in jsonpatch==1.33 # via -r requirements.in -jsonpointer==2.4 +jsonpointer==2.3 # via jsonpatch -jsonschema==4.19.1 +jsonschema==4.17.0 # via # ansible-compat # molecule -jsonschema-specifications==2023.7.1 - # via jsonschema -kubernetes==28.1.0 +kubernetes==25.3.0 # via -r requirements.in -markdown-it-py==3.0.0 - # via rich -markupsafe==2.1.3 +markupsafe==2.1.1 # via jinja2 -mdurl==0.1.2 - # via markdown-it-py -molecule==6.0.2 +molecule==4.0.4 # via # -r requirements.in # molecule-vagrant -molecule-vagrant==2.0.0 +molecule-vagrant==1.0.0 # via -r requirements.in netaddr==0.9.0 # via -r requirements.in -nodeenv==1.8.0 +nodeenv==1.7.0 # via pre-commit oauthlib==3.2.2 - # via - # kubernetes - # requests-oauthlib -packaging==23.2 + # via requests-oauthlib +packaging==21.3 # via # ansible-compat # ansible-core # molecule -platformdirs==3.11.0 +platformdirs==2.5.2 # via virtualenv -pluggy==1.3.0 +pluggy==1.0.0 # via molecule -pre-commit==3.5.0 +pre-commit==2.21.0 # via -r requirements.in pre-commit-hooks==4.5.0 # via -r requirements.in -pyasn1==0.5.0 +pyasn1==0.4.8 # via # pyasn1-modules # rsa -pyasn1-modules==0.3.0 +pyasn1-modules==0.2.8 # via google-auth pycparser==2.21 # via cffi -pygments==2.16.1 +pygments==2.13.0 # via rich +pyparsing==3.0.9 + # via packaging +pyrsistent==0.19.2 + # via jsonschema python-dateutil==2.8.2 - # via kubernetes + # via + # arrow + # kubernetes +python-slugify==6.1.2 + # via cookiecutter python-vagrant==1.0.0 # via molecule-vagrant pyyaml==6.0.1 @@ -122,53 +132,46 @@ pyyaml==6.0.1 # -r requirements.in # ansible-compat # ansible-core + # cookiecutter # kubernetes # molecule # molecule-vagrant # pre-commit -referencing==0.30.2 - # via - # jsonschema - # jsonschema-specifications -requests==2.31.0 +requests==2.28.1 # via + # cookiecutter # kubernetes # requests-oauthlib requests-oauthlib==1.3.1 # via kubernetes -resolvelib==1.0.1 +resolvelib==0.8.1 # via ansible-core -rich==13.6.0 +rich==12.6.0 # via # enrich # molecule -rpds-py==0.10.6 - # via - # jsonschema - # referencing rsa==4.9 # via google-auth -ruamel-yaml==0.18.3 +ruamel-yaml==0.17.21 # via pre-commit-hooks -ruamel-yaml-clib==0.2.8 - # via ruamel-yaml -selinux==0.3.0 +selinux==0.2.1 # via molecule-vagrant six==1.16.0 # via + # google-auth # kubernetes # python-dateutil subprocess-tee==0.4.1 # via ansible-compat -urllib3==1.26.18 +text-unidecode==1.3 + # via python-slugify +urllib3==1.26.12 # via # kubernetes # requests -virtualenv==20.24.6 +virtualenv==20.16.6 # via pre-commit -wcmatch==8.5 - # via molecule -websocket-client==1.6.4 +websocket-client==1.4.2 # via kubernetes # The following packages are considered to be unsafe in a requirements file: From 9e9b862334c55eda6ff4f225a5bd90a94c3fd6be Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Mon, 30 Oct 2023 16:00:55 -0500 Subject: [PATCH 55/59] fix(CI): Remove vagrant box cache --- .github/workflows/test-default.yml | 9 --------- .github/workflows/test-ipv6.yml | 9 --------- .github/workflows/test-single-node.yml | 9 --------- 3 files changed, 27 deletions(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index e6c067d..5c207c6 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -35,15 +35,6 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - - name: Cache Vagrant boxes - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # 3.3.2 - with: - path: | - ~/.vagrant.d/boxes - key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }} - restore-keys: | - vagrant-boxes - - name: Download Vagrant boxes for all scenarios # To save some cache space, all scenarios share the same cache key. # On the other hand, this means that the cache contents should be diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index bf4eb2c..0570c43 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -35,15 +35,6 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - - name: Cache Vagrant boxes - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # 3.3.2 - with: - path: | - ~/.vagrant.d/boxes - key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }} - restore-keys: | - vagrant-boxes - - name: Download Vagrant boxes for all scenarios # To save some cache space, all scenarios share the same cache key. # On the other hand, this means that the cache contents should be diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index de2cdc1..cfe56f6 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -35,15 +35,6 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - - name: Cache Vagrant boxes - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # 3.3.2 - with: - path: | - ~/.vagrant.d/boxes - key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }} - restore-keys: | - vagrant-boxes - - name: Download Vagrant boxes for all scenarios # To save some cache space, all scenarios share the same cache key. # On the other hand, this means that the cache contents should be From 723f07caf128ab33ebda02a379a1388b8c361e66 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Wed, 1 Nov 2023 11:24:06 -0500 Subject: [PATCH 56/59] fix(CI): testing ubuntu --- .github/workflows/lint.yml | 2 +- .github/workflows/test-default.yml | 2 +- .github/workflows/test-ipv6.yml | 2 +- .github/workflows/test-single-node.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index eab7c80..6a92785 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,7 +5,7 @@ on: jobs: pre-commit-ci: name: Pre-Commit - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: PYTHON_VERSION: "3.11" diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index 5c207c6..35cca4a 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -5,7 +5,7 @@ on: jobs: molecule: name: Molecule - runs-on: macos-12 + runs-on: ubuntu-22.04 strategy: matrix: scenario: diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index 0570c43..0f65969 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -5,7 +5,7 @@ on: jobs: molecule: name: Molecule - runs-on: macos-12 + runs-on: ubuntu-22.04 strategy: matrix: scenario: diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index cfe56f6..45977db 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -5,7 +5,7 @@ on: jobs: molecule: name: Molecule - runs-on: macos-12 + runs-on: ubuntu-22.04 strategy: matrix: scenario: From 69c8d28c36fe7271adc2b9f91b010a56accf62cd Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Wed, 1 Nov 2023 11:29:32 -0500 Subject: [PATCH 57/59] fix(CI): testing macos-latest --- .github/workflows/test-default.yml | 2 +- .github/workflows/test-ipv6.yml | 2 +- .github/workflows/test-single-node.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index 35cca4a..44eac21 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -5,7 +5,7 @@ on: jobs: molecule: name: Molecule - runs-on: ubuntu-22.04 + runs-on: macos-latest strategy: matrix: scenario: diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index 0f65969..a124706 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -5,7 +5,7 @@ on: jobs: molecule: name: Molecule - runs-on: ubuntu-22.04 + runs-on: macos-latest strategy: matrix: scenario: diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index 45977db..b6b880b 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -5,7 +5,7 @@ on: jobs: molecule: name: Molecule - runs-on: ubuntu-22.04 + runs-on: macos-latest strategy: matrix: scenario: From af7f41379b7b7a451ca965574430b52d9d94b215 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Wed, 1 Nov 2023 12:05:58 -0500 Subject: [PATCH 58/59] fix(CI): testing macos-13 --- .github/workflows/test-default.yml | 2 +- .github/workflows/test-ipv6.yml | 2 +- .github/workflows/test-single-node.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index 44eac21..cefbcd3 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -5,7 +5,7 @@ on: jobs: molecule: name: Molecule - runs-on: macos-latest + runs-on: macos-13 strategy: matrix: scenario: diff --git a/.github/workflows/test-ipv6.yml b/.github/workflows/test-ipv6.yml index a124706..053b569 100644 --- a/.github/workflows/test-ipv6.yml +++ b/.github/workflows/test-ipv6.yml @@ -5,7 +5,7 @@ on: jobs: molecule: name: Molecule - runs-on: macos-latest + runs-on: macos-13 strategy: matrix: scenario: diff --git a/.github/workflows/test-single-node.yml b/.github/workflows/test-single-node.yml index b6b880b..509ad3a 100644 --- a/.github/workflows/test-single-node.yml +++ b/.github/workflows/test-single-node.yml @@ -5,7 +5,7 @@ on: jobs: molecule: name: Molecule - runs-on: macos-latest + runs-on: macos-13 strategy: matrix: scenario: From ca79207dc9e28d750e495a75a1042921c7e88b8c Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sat, 9 Dec 2023 22:22:19 -0600 Subject: [PATCH 59/59] chore(ci): triggering build