From 8e73eb87cf3a482700d3654c007d8d62b8878116 Mon Sep 17 00:00:00 2001 From: bunkerity Date: Fri, 3 Mar 2023 10:11:58 +0100 Subject: [PATCH] ci/cd - fix syntax errors --- .github/workflows/staging.yml | 85 ++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 35e32a499..b9763a5b4 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -165,58 +165,63 @@ jobs: tests-docker: needs: [infra-create-docker] runs-on: [self-hosted, bw-docker] - uses: bunkerity/bunkerweb/.github/workflows/staging-tests.yml@staging - 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 }} + steps: + - uses: bunkerity/bunkerweb/.github/workflows/staging-tests.yml@staging + 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 }} tests-autoconf: needs: [infra-create-autoconf] runs-on: [self-hosted, bw-autoconf] - uses: bunkerity/bunkerweb/.github/workflows/staging-tests.yml@staging - 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 }} + steps: + - uses: bunkerity/bunkerweb/.github/workflows/staging-tests.yml@staging + 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 }} tests-swarm: needs: [infra-create-swarm] runs-on: [self-hosted, bw-swarm] - uses: bunkerity/bunkerweb/.github/workflows/staging-tests.yml@staging - 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 }} + steps: + - uses: bunkerity/bunkerweb/.github/workflows/staging-tests.yml@staging + 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 }} tests-k8s: needs: [infra-create-k8s] runs-on: [ubuntu-latest] - uses: bunkerity/bunkerweb/.github/workflows/staging-tests.yml@staging - 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 }} + steps: + - uses: bunkerity/bunkerweb/.github/workflows/staging-tests.yml@staging + 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 }} tests-linux: needs: [infra-create-k8s] runs-on: [self-hosted, bw-linux] - uses: bunkerity/bunkerweb/.github/workflows/staging-tests.yml@staging - 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 }} + steps: + - uses: bunkerity/bunkerweb/.github/workflows/staging-tests.yml@staging + 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 }} # Delete infrastructures delete-infra-docker: