Skip to content

Commit 4cc4697

Browse files
committed
chore: fix
1 parent 3b94650 commit 4cc4697

File tree

1 file changed

+37
-37
lines changed

1 file changed

+37
-37
lines changed

.github/workflows/e2e.yml

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -184,48 +184,48 @@ jobs:
184184
# E2E_REPEATER_TARGET_CMD: ${{ steps.target.outputs.cmd }}
185185
# E2E_TEST_TIMEOUT: ${{ inputs.test_timeout }}
186186

187-
# docker:
188-
# if: ${{ inputs.test-docker }}
189-
# runs-on: ${{ matrix.os }}
190-
# strategy:
191-
# fail-fast: false
192-
# matrix:
193-
# # Windows can't run linux docker images: https://github.com/actions/runner-images/issues/1143
194-
# os: [ubuntu-latest, macos-latest]
195-
# steps:
196-
# - name: Install Docker (MacOS)
197-
# if: ${{ startsWith(matrix.os, 'macos') }}
198-
# uses: docker-practice/actions-setup-docker@master
199-
# timeout-minutes: 12
187+
docker:
188+
if: ${{ inputs.test-docker }}
189+
runs-on: ${{ matrix.os }}
190+
strategy:
191+
fail-fast: false
192+
matrix:
193+
# Windows can't run linux docker images: https://github.com/actions/runner-images/issues/1143
194+
os: [ubuntu-latest, macos-latest]
195+
steps:
196+
- name: Install Docker (MacOS)
197+
if: ${{ startsWith(matrix.os, 'macos') }}
198+
uses: docker-practice/actions-setup-docker@master
199+
timeout-minutes: 12
200200

201-
# - name: Pull Image
202-
# run: docker pull brightsec/cli:${{ inputs.version }}
201+
- name: Pull Image
202+
run: docker pull brightsec/cli:${{ inputs.version }}
203203

204-
# - name: Checkout Repository
205-
# uses: actions/checkout@v2
204+
- name: Checkout Repository
205+
uses: actions/checkout@v2
206206

207-
# - name: Download Target
208-
# id: target
209-
# uses: ./.github/workflows/composite/todoapp
207+
- name: Download Target
208+
id: target
209+
uses: ./.github/workflows/composite/todoapp
210210

211-
# - name: Install Dependencies
212-
# uses: ./.github/workflows/composite/npm
213-
# with:
214-
# # https://github.com/actions/setup-node/issues/286#issuecomment-878865957
215-
# cache: ''
211+
- name: Install Dependencies
212+
uses: ./.github/workflows/composite/npm
213+
with:
214+
# https://github.com/actions/setup-node/issues/286#issuecomment-878865957
215+
cache: ''
216216

217-
# - name: Run Tests
218-
# run: npm run test:e2e
219-
# env:
220-
# E2E_CLI_VERSION: ${{ inputs.version }}
221-
# E2E_CLI_CMD: docker run --add-host host.docker.internal:host-gateway --network host brightsec/cli:${{ inputs.version }}
222-
# E2E_RUN_ID: ${{ format('{0}-{1}-{2}-{3}', github.run_number, github.run_attempt, github.job, strategy.job-index) }}
223-
# E2E_CLUSTER: ${{ vars[format('E2E_{0}_HOST', inputs.environment )] }}
224-
# E2E_PROJECT_ID: ${{ vars[format('E2E_{0}_PROJECT_ID', inputs.environment )] }}
225-
# E2E_CLUSTER_API_KEY: ${{ secrets[format('E2E_{0}_API_KEY', inputs.environment )] }}
226-
# E2E_REPEATER_TARGET_URL: ${{ format('http://host.docker.internal:{0}', steps.target.outputs.port) }}
227-
# E2E_REPEATER_TARGET_CMD: ${{ steps.target.outputs.cmd }}
228-
# E2E_TEST_TIMEOUT: ${{ inputs.test_timeout }}
217+
- name: Run Tests
218+
run: npm run test:e2e
219+
env:
220+
E2E_CLI_VERSION: ${{ inputs.version }}
221+
E2E_CLI_CMD: docker run --add-host host.docker.internal:host-gateway --network host brightsec/cli:${{ inputs.version }}
222+
E2E_RUN_ID: ${{ format('{0}-{1}-{2}-{3}', github.run_number, github.run_attempt, github.job, strategy.job-index) }}
223+
E2E_CLUSTER: ${{ vars[format('E2E_{0}_HOST', inputs.environment )] }}
224+
E2E_PROJECT_ID: ${{ vars[format('E2E_{0}_PROJECT_ID', inputs.environment )] }}
225+
E2E_CLUSTER_API_KEY: ${{ secrets[format('E2E_{0}_API_KEY', inputs.environment )] }}
226+
E2E_REPEATER_TARGET_URL: ${{ format('http://host.docker.internal:{0}', steps.target.outputs.port) }}
227+
E2E_REPEATER_TARGET_CMD: ${{ steps.target.outputs.cmd }}
228+
E2E_TEST_TIMEOUT: ${{ inputs.test_timeout }}
229229
# npm:
230230
# if: ${{ inputs.test-npm }}
231231
# runs-on: ${{ matrix.os }}

0 commit comments

Comments
 (0)