Skip to content

Commit d404c51

Browse files
committed
SCF-788: Added pull requests to test the workflow on the pr
1 parent 0df17b1 commit d404c51

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

.github/workflows/build-and-push.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: Build and Push Docker Images to Harbor
22

33
on:
4+
pull_request:
5+
paths-ignore:
6+
- '**.md'
7+
- 'docs/**'
8+
branches:
9+
- 'scalefield_v*'
410
push:
511
paths-ignore:
612
- '**.md'
@@ -25,20 +31,21 @@ on:
2531
default: true
2632

2733
concurrency:
28-
group: ${{ github.ref }}
34+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
2935
cancel-in-progress: true
3036

3137
jobs:
3238
e2e-tests:
3339
name: Run E2E Tests
34-
if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && inputs.run_e2e_tests)
40+
if: github.event_name == 'push' || github.event_name == 'pull_request' || (github.event_name == 'workflow_dispatch' && inputs.run_e2e_tests)
3541
uses: ./.github/workflows/run_e2e.yaml
3642

3743
build-and-push:
3844
name: Build and Push Docker Images to Harbor
3945
needs: [e2e-tests]
4046
if: always() && (needs.e2e-tests.result == 'success' || needs.e2e-tests.result == 'skipped')
41-
runs-on: ubuntu-latest-m
47+
runs-on: ubuntu-latest
48+
timeout-minutes: 60
4249
env:
4350
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
4451
steps:

.github/workflows/run_e2e.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: operator-e2e-tests
22

3-
on:
3+
on:
4+
workflow_call:
45
pull_request:
56
push:
67
branches:

0 commit comments

Comments
 (0)