CI runners changes & synpress pre-flight check

golemfoundation · Apr 8, 2024 · 41e9bea · 41e9bea
1 parent 1dad5ac
commit 41e9bea
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 }}