Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions .github/workflows/dev_opened_or_updated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,32 +44,32 @@ jobs:
docker-registry.bimdata.io/bimdata/${{ env.app }}:${{ github.sha }}
docker-registry.bimdata.io/bimdata/${{ env.app }}:${{ steps.branch.outputs.name }}

e2e-tests:
permissions:
contents: read
runs-on: [self-hosted, testendtoend]
if: ${{ !contains(github.event.pull_request.body , '[ ] I want to run the tests for the commits of this PR') }}
needs: build-and-push
steps:
- uses: actions/checkout@v7
with:
repository: bimdata/bimdata-test
ref: master
token: ${{ secrets.REPOS_TOKEN }}
persist-credentials: false
- name: Define branch_name var
id: branch
run: |
echo "name=$(echo dev_${GITHUB_HEAD_REF##*/} | tr ' .-' _ | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
- name: Run e2e tests
uses: ./end-to-end/
with:
docker_tag: staging
docker_platform_tag: ${{ steps.branch.outputs.name }}
ref: ${{ github.ref }}
github_token: ${{ secrets.REPOS_TOKEN }}
vault_passwd: ${{ secrets.VAULT_PASSWD }}
cypress_version: 13.1.0
# e2e-tests:
# permissions:
# contents: read
# runs-on: [self-hosted, testendtoend]
# if: ${{ !contains(github.event.pull_request.body , '[ ] I want to run the tests for the commits of this PR') }}
# needs: build-and-push
# steps:
# - uses: actions/checkout@v7
# with:
# repository: bimdata/bimdata-test
# ref: master
# token: ${{ secrets.REPOS_TOKEN }}
# persist-credentials: false
# - name: Define branch_name var
# id: branch
# run: |
# echo "name=$(echo dev_${GITHUB_HEAD_REF##*/} | tr ' .-' _ | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
# - name: Run e2e tests
# uses: ./end-to-end/
# with:
# docker_tag: staging
# docker_platform_tag: ${{ steps.branch.outputs.name }}
# ref: ${{ github.ref }}
# github_token: ${{ secrets.REPOS_TOKEN }}
# vault_passwd: ${{ secrets.VAULT_PASSWD }}
# cypress_version: 13.1.0

deploy:
permissions:
Expand Down
54 changes: 27 additions & 27 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,33 +69,33 @@ jobs:
- name: Run unit tests
run: npm install && npm run test:unit

e2e-tests:
runs-on: [self-hosted, testendtoend]
needs: build-and-push
if: ${{ !contains(github.event.head_commit.message, '[skip e2e]') &&
github.ref != 'refs/heads/main' &&
github.ref != 'refs/heads/master' &&
github.ref != 'refs/heads/release' }}
steps:
- uses: actions/checkout@v7
with:
repository: bimdata/bimdata-test
ref: master
token: ${{ secrets.REPOS_TOKEN }}
persist-credentials: false
- id: tag
name: Get docker tag
uses: bimdata/actions/get-docker-tag@v6
with:
branch: ${{ github.ref }}
- name: Run e2e tests
uses: ./end-to-end/
with:
ref: ${{ github.ref }}
docker_tag: ${{ env.tag }}
github_token: ${{ secrets.REPOS_TOKEN }}
vault_passwd: ${{ secrets.VAULT_PASSWD }}
cypress_version: 13.16.0
# e2e-tests:
# runs-on: [self-hosted, testendtoend]
# needs: build-and-push
# if: ${{ !contains(github.event.head_commit.message, '[skip e2e]') &&
# github.ref != 'refs/heads/main' &&
# github.ref != 'refs/heads/master' &&
# github.ref != 'refs/heads/release' }}
# steps:
# - uses: actions/checkout@v7
# with:
# repository: bimdata/bimdata-test
# ref: master
# token: ${{ secrets.REPOS_TOKEN }}
# persist-credentials: false
# - id: tag
# name: Get docker tag
# uses: bimdata/actions/get-docker-tag@v6
# with:
# branch: ${{ github.ref }}
# - name: Run e2e tests
# uses: ./end-to-end/
# with:
# ref: ${{ github.ref }}
# docker_tag: ${{ env.tag }}
# github_token: ${{ secrets.REPOS_TOKEN }}
# vault_passwd: ${{ secrets.VAULT_PASSWD }}
# cypress_version: 13.16.0

deploy:
runs-on: [self-hosted, common]
Expand Down
Loading