From 41e9bea0a3e1f92afff3cc4637cc291d184ffbf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kluczek?= Date: Mon, 8 Apr 2024 18:58:53 +0200 Subject: [PATCH] CI runners changes & synpress pre-flight check --- .github/workflows/ci-run.yml | 23 +++++++++++++---------- .github/workflows/deploy-pr.yml | 2 +- .github/workflows/deploy-prod.yml | 2 +- .github/workflows/deploy-rc.yml | 2 +- .github/workflows/tpl-deploy-app.yml | 14 +++++++------- .github/workflows/tpl-destroy-env.yml | 2 +- .github/workflows/tpl-images.yml | 2 +- .github/workflows/tpl-start-env.yml | 2 +- 8 files changed, 26 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci-run.yml b/.github/workflows/ci-run.yml index d18daf1997..65f6ed9482 100644 --- a/.github/workflows/ci-run.yml +++ b/.github/workflows/ci-run.yml @@ -45,7 +45,7 @@ jobs: needs: - deploy-e2e-env runs-on: - - metal + - e2e container: image: registry.gitlab.com/golemfoundation/devops/container-builder/octant/synpress-arch:71c6cbc5 credentials: @@ -105,6 +105,9 @@ jobs: source /usr/bin/entrypoint.sh + curl --retry-connrefused --retry 100 --retry-delay 3 \ + -s -X GET $OCTANT_BASE_URL + yarn synpress:run shell: bash @@ -122,7 +125,7 @@ jobs: needs: - deploy-apitest-env runs-on: - - metal + - general container: image: registry.gitlab.com/golemfoundation/devops/container-builder/octant/python-poetry-ext:ad1d9179 credentials: @@ -262,7 +265,7 @@ jobs: needs: - lint-and-typecheck-yarn runs-on: - - metal + - general container: image: registry.gitlab.com/golemfoundation/devops/container-builder/octant/node-extended:bdda411c credentials: @@ -308,7 +311,7 @@ jobs: needs: - lint-and-typecheck-poetry runs-on: - - metal + - general container: image: registry.gitlab.com/golemfoundation/devops/container-builder/octant/python-poetry-ext:ad1d9179 credentials: @@ -334,7 +337,7 @@ jobs: needs: - build-backend runs-on: - - metal + - general container: image: registry.gitlab.com/golemfoundation/devops/container-builder/octant/python-poetry-ext:ad1d9179 credentials: @@ -362,7 +365,7 @@ jobs: - build-contracts - build-services runs-on: - - metal + - general container: image: registry.gitlab.com/golemfoundation/devops/container-builder/octant/node-extended:bdda411c credentials: @@ -413,7 +416,7 @@ jobs: needs: - build-contracts runs-on: - - metal + - general container: image: registry.gitlab.com/golemfoundation/devops/container-builder/octant/node-extended:bdda411c credentials: @@ -447,7 +450,7 @@ jobs: build-backend: name: Build Services runs-on: - - metal + - general needs: - permissions-check container: @@ -469,7 +472,7 @@ jobs: build-contracts: name: Build Contracts runs-on: - - metal + - general needs: - permissions-check container: @@ -503,7 +506,7 @@ jobs: permissions-check: name: Permissions check runs-on: - - metal + - general steps: - name: Check if user is an org member uses: actions/github-script@v7 diff --git a/.github/workflows/deploy-pr.yml b/.github/workflows/deploy-pr.yml index ad5d5cabeb..a8703199ff 100644 --- a/.github/workflows/deploy-pr.yml +++ b/.github/workflows/deploy-pr.yml @@ -47,7 +47,7 @@ jobs: name: Run if: github.event.issue.pull_request && contains(github.event.comment.body, '/deploy') runs-on: - - metal + - general outputs: sha: ${{ steps.comment-branch.outputs.head_sha }} ref: ${{ steps.comment-branch.outputs.head_ref }} diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 085aa6e5ab..0531404615 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -9,7 +9,7 @@ jobs: run-deployment: name: Run Deployment runs-on: - - metal + - general steps: - name: Sanitise variables id: sanitise-vars diff --git a/.github/workflows/deploy-rc.yml b/.github/workflows/deploy-rc.yml index ad9bfd258a..f10cda2e63 100644 --- a/.github/workflows/deploy-rc.yml +++ b/.github/workflows/deploy-rc.yml @@ -25,7 +25,7 @@ jobs: needs: - build runs-on: - - metal + - general container: image: registry.gitlab.com/golemfoundation/devops/container-builder/gitops-builder:2ea6d57c credentials: diff --git a/.github/workflows/tpl-deploy-app.yml b/.github/workflows/tpl-deploy-app.yml index 16e3fe3127..ac45253976 100644 --- a/.github/workflows/tpl-deploy-app.yml +++ b/.github/workflows/tpl-deploy-app.yml @@ -167,7 +167,7 @@ jobs: name: Start Anvil if: ${{ inputs.deploy-contracts }} runs-on: - - metal + - general container: image: registry.gitlab.com/golemfoundation/devops/container-builder/gitops-builder:2ea6d57c credentials: @@ -213,7 +213,7 @@ jobs: - start-anvil if: ${{ inputs.deploy-contracts }} runs-on: - - metal + - general outputs: anvil_rpc_url: ${{ steps.deploy.outputs.LOCAL_RPC_URL }} container: @@ -242,7 +242,7 @@ jobs: # BUG: For some reason this cache is a problem for this job to pass # https://linear.app/golemfoundation/issue/OCT-1382/error-during-ci-contracts-deployment - rm -r $HOME/.cache/hardhat-nodejs/ + rm -r $HOME/.cache/hardhat-nodejs/ || true /app/entrypoint.sh $NETWORK ${CI_PROJECT_DIR}/contracts.env @@ -264,7 +264,7 @@ jobs: needs: - deploy-contracts runs-on: - - metal + - general if: always() container: image: registry.gitlab.com/golemfoundation/devops/container-builder/gitops-builder:2ea6d57c @@ -306,7 +306,7 @@ jobs: needs: - start-application-stack runs-on: - - metal + - general if: always() && (needs.start-application-stack.result == 'success') outputs: octant_web_url: ${{ steps.app.outputs.OCTANT_WEB_URL }} @@ -345,7 +345,7 @@ jobs: - wait-for-app if: ${{ success() && inputs.deploy-contracts && (inputs.env-type == 'uat' || inputs.env-type == 'master') }} runs-on: - - metal + - general container: image: registry.gitlab.com/golemfoundation/devops/container-builder/gitops-builder:2ea6d57c credentials: @@ -392,7 +392,7 @@ jobs: - start-application-stack - wait-for-app runs-on: - - metal + - general if: always() steps: - name: Compute workflow status diff --git a/.github/workflows/tpl-destroy-env.yml b/.github/workflows/tpl-destroy-env.yml index 175ce3a0fe..f439f6914c 100644 --- a/.github/workflows/tpl-destroy-env.yml +++ b/.github/workflows/tpl-destroy-env.yml @@ -35,7 +35,7 @@ jobs: destroy: name: Destroy Environment runs-on: - - metal + - general if: (github.event_name == 'issue_comment' && contains(github.event.comment.body, '/destroy')) || github.event_name != 'issue_comment' container: image: registry.gitlab.com/golemfoundation/devops/container-builder/gitops-builder:2ea6d57c diff --git a/.github/workflows/tpl-images.yml b/.github/workflows/tpl-images.yml index c9e29953fd..81805dae98 100644 --- a/.github/workflows/tpl-images.yml +++ b/.github/workflows/tpl-images.yml @@ -17,7 +17,7 @@ jobs: build-images: name: Build Docker Image runs-on: - - metal + - general strategy: matrix: SERVICE: diff --git a/.github/workflows/tpl-start-env.yml b/.github/workflows/tpl-start-env.yml index 7d5cd4cfbf..ea28623e92 100644 --- a/.github/workflows/tpl-start-env.yml +++ b/.github/workflows/tpl-start-env.yml @@ -38,7 +38,7 @@ jobs: start: name: Start GitHub Environment runs-on: - - metal + - general outputs: env: ${{ steps.start-deployment.outputs.env }} deployment: ${{ steps.start-deployment.outputs.deployment_id }}