From 43c1b92435ee220dd7e8cfad7710faccbbc7cbd2 Mon Sep 17 00:00:00 2001 From: joss Date: Thu, 8 Aug 2024 11:19:27 +0100 Subject: [PATCH 1/9] test: runs-on input to workflows --- .github/workflows/controller-container.yaml | 2 +- .github/workflows/controller-flake8.yaml | 4 +--- .github/workflows/fizzbuzz-chart.yaml | 2 +- .github/workflows/fizzbuzz-crds-chart.yaml | 2 +- .github/workflows/internal-container.yaml | 2 +- .github/workflows/multi-container-test.yaml | 8 ++++---- .github/workflows/pr-labeler.yaml | 2 +- .github/workflows/pr-title-commitlint.yaml | 2 +- .github/workflows/renovate.yaml | 2 +- .github/workflows/trino-container.yaml | 2 +- 10 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.github/workflows/controller-container.yaml b/.github/workflows/controller-container.yaml index 10a069d1..e5830502 100644 --- a/.github/workflows/controller-container.yaml +++ b/.github/workflows/controller-container.yaml @@ -42,7 +42,7 @@ jobs: # Job name must be unique across repo to target # branch protection rules "required checks" properly! controller-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v2.0.1-containers + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@feat/runs-on-input with: job-name: controller-container comment-pr: "true" diff --git a/.github/workflows/controller-flake8.yaml b/.github/workflows/controller-flake8.yaml index 670da99e..a98838e1 100644 --- a/.github/workflows/controller-flake8.yaml +++ b/.github/workflows/controller-flake8.yaml @@ -23,9 +23,7 @@ concurrency: jobs: controller-flake8: - runs-on: - labels: [self-hosted, linux, x64] - group: light + runs-on: "k8s-dev-linux-default" steps: - name: clone repo diff --git a/.github/workflows/fizzbuzz-chart.yaml b/.github/workflows/fizzbuzz-chart.yaml index e3a6b17e..6db19441 100644 --- a/.github/workflows/fizzbuzz-chart.yaml +++ b/.github/workflows/fizzbuzz-chart.yaml @@ -41,7 +41,7 @@ jobs: # Job name must be unique across repo to target # branch protection rules "required checks" properly! fizzbuzz-chart: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-chart.yaml@v2.0.3-charts + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-chart.yaml@feat/runs-on-input with: job-name: fizzbuzz-chart comment-pr: "true" diff --git a/.github/workflows/fizzbuzz-crds-chart.yaml b/.github/workflows/fizzbuzz-crds-chart.yaml index 12fde54d..b8e4f245 100644 --- a/.github/workflows/fizzbuzz-crds-chart.yaml +++ b/.github/workflows/fizzbuzz-crds-chart.yaml @@ -41,7 +41,7 @@ jobs: # Job name must be unique across repo to target # branch protection rules "required checks" properly! fizzbuzz-crds-chart: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-chart.yaml@v2.0.3-charts + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-chart.yaml@feat/runs-on-input with: job-name: fizzbuzz-crds-chart comment-pr: "true" diff --git a/.github/workflows/internal-container.yaml b/.github/workflows/internal-container.yaml index b603229e..521a41e9 100644 --- a/.github/workflows/internal-container.yaml +++ b/.github/workflows/internal-container.yaml @@ -36,7 +36,7 @@ jobs: # Job name must be unique across repo to target # branch protection rules "required checks" properly! internal-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v2.0.1-containers + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@feat/runs-on-input with: job-name: internal-container comment-pr: "true" diff --git a/.github/workflows/multi-container-test.yaml b/.github/workflows/multi-container-test.yaml index 2c3544eb..e9d88e66 100644 --- a/.github/workflows/multi-container-test.yaml +++ b/.github/workflows/multi-container-test.yaml @@ -39,14 +39,14 @@ jobs: # Job name must be unique across repo to target # branch protection rules "required checks" properly! setup: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-repo.yaml@v1.0.0-repo + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-repo.yaml@feat/runs-on-input with: job-name: setup release-tag-format: 'v${version}-bulk-release-test' controller-container: needs: setup - uses: SwanseaUniversityMedical/workflows/.github/workflows/bulk-pr-and-release-container.yaml@v1.0.0-bulk-containers + uses: SwanseaUniversityMedical/workflows/.github/workflows/bulk-pr-and-release-container.yaml@feat/runs-on-input with: job-name: controller-container comment-pr: "true" @@ -65,7 +65,7 @@ jobs: trino-container: needs: setup - uses: SwanseaUniversityMedical/workflows/.github/workflows/bulk-pr-and-release-container.yaml@v1.0.0-bulk-containers + uses: SwanseaUniversityMedical/workflows/.github/workflows/bulk-pr-and-release-container.yaml@feat/runs-on-input with: job-name: trino-container comment-pr: "true" @@ -86,7 +86,7 @@ jobs: fizzbuzz-chart: needs: setup - uses: SwanseaUniversityMedical/workflows/.github/workflows/bulk-pr-and-release-chart.yaml@v1.0.0-bulk-charts + uses: SwanseaUniversityMedical/workflows/.github/workflows/bulk-pr-and-release-chart.yaml@feat/runs-on-input with: job-name: fizzbuzz-chart comment-pr: "true" diff --git a/.github/workflows/pr-labeler.yaml b/.github/workflows/pr-labeler.yaml index f61dcea3..bf006792 100644 --- a/.github/workflows/pr-labeler.yaml +++ b/.github/workflows/pr-labeler.yaml @@ -14,4 +14,4 @@ concurrency: jobs: pr-labeler: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-labeler.yaml@v1.1.1-pr-labeler + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-labeler.yaml@feat/runs-on-input diff --git a/.github/workflows/pr-title-commitlint.yaml b/.github/workflows/pr-title-commitlint.yaml index 2859a089..934e567f 100644 --- a/.github/workflows/pr-title-commitlint.yaml +++ b/.github/workflows/pr-title-commitlint.yaml @@ -16,4 +16,4 @@ concurrency: jobs: pr-title-commitlint: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-title-commitlint.yaml@v1.4.0-pr-title-commitlint + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-title-commitlint.yaml@feat/runs-on-input diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml index 14bebfb3..d539ce84 100644 --- a/.github/workflows/renovate.yaml +++ b/.github/workflows/renovate.yaml @@ -19,7 +19,7 @@ jobs: group: heavy steps: - - uses: SwanseaUniversityMedical/workflows/.github/actions/renovate@v1.0.0-renovate + - uses: SwanseaUniversityMedical/workflows/.github/actions/renovate@feat/runs-on-input with: token: ${{ secrets.RENOVATE_TOKEN }} env: diff --git a/.github/workflows/trino-container.yaml b/.github/workflows/trino-container.yaml index 1df7f8d9..7a2e6f27 100644 --- a/.github/workflows/trino-container.yaml +++ b/.github/workflows/trino-container.yaml @@ -41,7 +41,7 @@ jobs: # Job name must be unique across repo to target # branch protection rules "required checks" properly! trino-container: - uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@v2.0.1-containers + uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@feat/runs-on-input with: job-name: trino-container comment-pr: "true" From d20869104e180d3f0c5efe7e894cc2ce6bc6978f Mon Sep 17 00:00:00 2001 From: Joss Whittle Date: Thu, 8 Aug 2024 17:08:14 +0100 Subject: [PATCH 2/9] test: trigger workflows --- .github/workflows/controller-flake8.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/controller-flake8.yaml b/.github/workflows/controller-flake8.yaml index a98838e1..45092b2c 100644 --- a/.github/workflows/controller-flake8.yaml +++ b/.github/workflows/controller-flake8.yaml @@ -23,7 +23,7 @@ concurrency: jobs: controller-flake8: - runs-on: "k8s-dev-linux-default" + runs-on: "k8s-dev-linux-default" steps: - name: clone repo From 3c27165b3f9c67c2d54d758dd484a05ad5aaaa65 Mon Sep 17 00:00:00 2001 From: Joss Whittle Date: Thu, 8 Aug 2024 17:54:29 +0100 Subject: [PATCH 3/9] test: Update controller-flake8.yaml --- .github/workflows/controller-flake8.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/controller-flake8.yaml b/.github/workflows/controller-flake8.yaml index 45092b2c..79891877 100644 --- a/.github/workflows/controller-flake8.yaml +++ b/.github/workflows/controller-flake8.yaml @@ -23,7 +23,7 @@ concurrency: jobs: controller-flake8: - runs-on: "k8s-dev-linux-default" + runs-on: "feda-linux-default" steps: - name: clone repo From bae0557ab00292a809a614e84825663295ae0a97 Mon Sep 17 00:00:00 2001 From: Joss Whittle Date: Thu, 8 Aug 2024 18:23:43 +0100 Subject: [PATCH 4/9] test: Update controller-flake8.yaml --- .github/workflows/controller-flake8.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/controller-flake8.yaml b/.github/workflows/controller-flake8.yaml index 79891877..e3e7e2b9 100644 --- a/.github/workflows/controller-flake8.yaml +++ b/.github/workflows/controller-flake8.yaml @@ -23,7 +23,7 @@ concurrency: jobs: controller-flake8: - runs-on: "feda-linux-default" + runs-on: "feda-linux-default" steps: - name: clone repo From cabd2a76f177f3fabd27f27d1e7c418bfaf18a1e Mon Sep 17 00:00:00 2001 From: joss Date: Fri, 9 Aug 2024 21:23:47 +0100 Subject: [PATCH 5/9] fix: call flake8 through python --- .github/workflows/controller-flake8.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/controller-flake8.yaml b/.github/workflows/controller-flake8.yaml index a98838e1..d9dfcb7d 100644 --- a/.github/workflows/controller-flake8.yaml +++ b/.github/workflows/controller-flake8.yaml @@ -37,4 +37,4 @@ jobs: - name: run flake8 run: | - flake8 containers/controller/src + python3 -m flake8 containers/controller/src From 63d4a071e3d6c11fe29f08b318bb990faa48542c Mon Sep 17 00:00:00 2001 From: joss Date: Fri, 9 Aug 2024 21:31:22 +0100 Subject: [PATCH 6/9] test: call flake8 directly with new container --- .github/workflows/controller-flake8.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/controller-flake8.yaml b/.github/workflows/controller-flake8.yaml index 94fe294e..79891877 100644 --- a/.github/workflows/controller-flake8.yaml +++ b/.github/workflows/controller-flake8.yaml @@ -23,7 +23,7 @@ concurrency: jobs: controller-flake8: - runs-on: "feda-linux-default" + runs-on: "feda-linux-default" steps: - name: clone repo @@ -37,4 +37,4 @@ jobs: - name: run flake8 run: | - python3 -m flake8 containers/controller/src + flake8 containers/controller/src From 0f503ba1f85f4c8c0dded2d1cd8bd4cd9fad43c0 Mon Sep 17 00:00:00 2001 From: Joss Whittle Date: Tue, 13 Aug 2024 10:45:19 +0100 Subject: [PATCH 7/9] test: Update controller-flake8.yaml --- .github/workflows/controller-flake8.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/controller-flake8.yaml b/.github/workflows/controller-flake8.yaml index 79891877..afdac032 100644 --- a/.github/workflows/controller-flake8.yaml +++ b/.github/workflows/controller-flake8.yaml @@ -37,4 +37,4 @@ jobs: - name: run flake8 run: | - flake8 containers/controller/src + python3 -m flake8 containers/controller/src From 82fe4dd2109cd65a1b16574d26a3eedd348cd210 Mon Sep 17 00:00:00 2001 From: joss Date: Tue, 20 Aug 2024 10:58:05 +0100 Subject: [PATCH 8/9] test: ubuntu runner --- .github/workflows/controller-flake8.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/controller-flake8.yaml b/.github/workflows/controller-flake8.yaml index afdac032..ffa3f8d8 100644 --- a/.github/workflows/controller-flake8.yaml +++ b/.github/workflows/controller-flake8.yaml @@ -23,7 +23,7 @@ concurrency: jobs: controller-flake8: - runs-on: "feda-linux-default" + runs-on: "ubuntu" steps: - name: clone repo From c8b2adaa5ca9af5cef629cca3b968696d9a9d580 Mon Sep 17 00:00:00 2001 From: joss Date: Tue, 20 Aug 2024 10:59:37 +0100 Subject: [PATCH 9/9] test: ubuntu runner --- .github/workflows/controller-flake8.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/controller-flake8.yaml b/.github/workflows/controller-flake8.yaml index ffa3f8d8..5e07695d 100644 --- a/.github/workflows/controller-flake8.yaml +++ b/.github/workflows/controller-flake8.yaml @@ -23,7 +23,7 @@ concurrency: jobs: controller-flake8: - runs-on: "ubuntu" + runs-on: "ubuntu-latest" steps: - name: clone repo