From b9c4c36ce09ba4011c516f15e3f937f7c9d38d37 Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Thu, 6 Feb 2020 12:59:39 +0100
Subject: [PATCH] update github actions to reduce false positives
---
.github/workflows/e2e.yml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index e8f8aed0c..86544b375 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -6,11 +6,11 @@ on:
- dev
env:
- DOCKER_IMAGE_NAME: interactive-viewer
+ DOCKER_IMAGE_NAME: gha-iav-image
DOCKER_IMAGE_TAG: ${{ github.sha }}
DOCKER_CONTAINER_NAME: gha-iav-built-${{ github.sha }}
DOCKER_E2E_PPTR: gha-iav-e2e-pptr-${{ github.sha }}
- DOCKER_E2E_NETWORK: gha-dkr-network-${{ github.sha }}
+ DOCKER_E2E_NETWORK: gha-dkr-network
ATLAS_URL: http://gha-iav-built-${{ github.sha }}:3000/
jobs:
@@ -33,6 +33,9 @@ jobs:
runs-on: self-hosted
needs: buildimage
steps:
+ - name: clean up previous
+ run: |
+ docker ps -a | grep gha | xargs docker stop
- name: run docker image ${{ env.DOCKER_IMAGE_NAME }}:${{ env.DOCKER_IMAGE_TAG }} as container ${{ env.DOCKER_CONTAINER_NAME }}
run: |
docker run \
@@ -58,7 +61,6 @@ jobs:
docker exec -t ${DOCKER_E2E_PPTR} npm i puppeteer
- name: Setup docker network
run: |
- docker network create ${{ env.DOCKER_E2E_NETWORK }}
docker network connect ${{ env.DOCKER_E2E_NETWORK }} ${{ env.DOCKER_E2E_PPTR }}
docker network connect ${{ env.DOCKER_E2E_NETWORK }} ${{ env.DOCKER_CONTAINER_NAME }}
- name: run pptr tests - ${{ env.ATLAS_URL }}
@@ -67,7 +69,4 @@ jobs:
- name: cleanup, stop container ${{ env.DOCKER_CONTAINER_NAME }}
if: success()
run: |
- docker stop ${DOCKER_CONTAINER_NAME}
- docker stop ${DOCKER_E2E_PPTR}
- docker network rm ${DOCKER_E2E_NETWORK}
docker rmi ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}
--
GitLab