From 97627cf836acd19b0e7a1c1ed6233abe896bc319 Mon Sep 17 00:00:00 2001 From: bunkerity Date: Fri, 3 Mar 2023 10:41:05 +0100 Subject: [PATCH] ci/cd - pass runs-on to reusable workflows --- .github/workflows/staging-tests.yml | 1 + .github/workflows/staging.yml | 95 ++++++++++++++--------------- 2 files changed, 46 insertions(+), 50 deletions(-) diff --git a/.github/workflows/staging-tests.yml b/.github/workflows/staging-tests.yml index 8e5c6a261..8c369742d 100644 --- a/.github/workflows/staging-tests.yml +++ b/.github/workflows/staging-tests.yml @@ -18,6 +18,7 @@ on: jobs: tests: + runs-on: ${{ github.event.inputs.RUNS_ON }} steps: # Prepare - name: Checkout source code diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index e010cca0b..017a54c9c 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -164,64 +164,59 @@ jobs: # Perform tests tests-docker: needs: [infra-create-docker] - runs-on: [self-hosted, bw-docker] - steps: - - uses: ./.github/workflows/staging-tests.yml - with: - TYPE: docker - secrets: - PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }} - PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} - TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_DOCKER }} - ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }} + uses: ./.github/workflows/staging-tests.yml + with: + TYPE: docker + RUNS_ON: [self-hosted, bw-docker] + secrets: + PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }} + PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} + TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_DOCKER }} + ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }} tests-autoconf: needs: [infra-create-autoconf] - runs-on: [self-hosted, bw-autoconf] - steps: - - uses: ./.github/workflows/staging-tests.yml - with: - TYPE: autoconf - secrets: - PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }} - PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} - TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_AUTOCONF }} - ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }} + uses: ./.github/workflows/staging-tests.yml + with: + TYPE: autoconf + RUNS_ON: [self-hosted, bw-autoconf] + secrets: + PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }} + PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} + TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_AUTOCONF }} + ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }} tests-swarm: needs: [infra-create-swarm] - runs-on: [self-hosted, bw-swarm] - steps: - - uses: ./.github/workflows/staging-tests.yml - with: - TYPE: swarm - secrets: - PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }} - PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} - TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_SWARM }} - ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }} + uses: ./.github/workflows/staging-tests.yml + with: + TYPE: swarm + RUNS_ON: [self-hosted, bw-swarm] + secrets: + PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }} + PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} + TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_SWARM }} + ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }} tests-k8s: needs: [infra-create-k8s] - runs-on: [ubuntu-latest] - steps: - - uses: ./.github/workflows/staging-tests.yml - with: - TYPE: k8s - secrets: - PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }} - PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} - TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_KUBERNETES }} - ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }} + uses: ./.github/workflows/staging-tests.yml + with: + TYPE: k8s + RUNS_ON: [ubuntu-latest] + secrets: + PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }} + PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} + TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_KUBERNETES }} + ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }} tests-linux: needs: [infra-create-k8s] - runs-on: [self-hosted, bw-linux] - steps: - - uses: ./.github/workflows/staging-tests.yml - with: - TYPE: linux - secrets: - PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }} - PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} - TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_LINUX }} - ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }} + uses: ./.github/workflows/staging-tests.yml + with: + TYPE: linux + RUNS_ON: [self-hosted, bw-linux] + secrets: + PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }} + PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} + TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_LINUX }} + ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }} # Delete infrastructures delete-infra-docker: