Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

Commit 756d28c

Browse files
author
Pavel Zorin
authored
CI: separate JJBB definitions for pull requests, PR merge and external e2e calls (#3253)
* CI: separate JJBB definitions for pull requests, PR merge and external e2e calls * CI: improved JJBB desriptions * JJBB fixed discove-tags * JJBB fixed discove-tags * Changed new JJBs for PR-3169 testing * review fixed * review fixed * review fixed
1 parent 665fc89 commit 756d28c

4 files changed

Lines changed: 142 additions & 1 deletion

File tree

.ci/jobs/e2e-testing-mbp-tmp.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
---
2+
- job:
3+
name: e2e-tests/e2e-testing-mbp-tmp
4+
display-name: Temporary End-2-End Tests Pipeline
5+
description: Temporary Jenkins pipeline for the e2e-testing project
6+
view: E2E
7+
project-type: multibranch
8+
logrotate:
9+
daysToKeep: 30
10+
numToKeep: 100
11+
number-to-keep: 100
12+
days-to-keep: 30
13+
script-path: .ci/Jenkinsfile-tmp
14+
scm:
15+
- github:
16+
branch-discovery: no-pr
17+
head-filter-regex: '(PR-3169)'
18+
discover-pr-forks-strategy: merge-current
19+
discover-pr-forks-trust: permission
20+
discover-pr-origin: merge-current
21+
discover-tags: true
22+
notification-context: 'beats-ci/e2e-testing'
23+
repo: e2e-testing
24+
repo-owner: elastic
25+
credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken
26+
ssh-checkout:
27+
credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba
28+
build-strategies:
29+
- tags:
30+
ignore-tags-older-than: -1
31+
ignore-tags-newer-than: -1
32+
- regular-branches: true
33+
- change-request:
34+
ignore-target-only-changes: true
35+
clean:
36+
after: true
37+
before: true
38+
prune: true
39+
shallow-clone: true
40+
depth: 4
41+
do-not-fetch-tags: true
42+
submodule:
43+
disable: false
44+
recursive: true
45+
parent-credentials: true
46+
timeout: 120
47+
timeout: '15'
48+
use-author: true
49+
wipe-workspace: 'True'

.ci/jobs/e2e-testing-mbp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@
4646
timeout: 120
4747
timeout: '15'
4848
use-author: true
49-
wipe-workspace: 'True'
49+
wipe-workspace: 'True'

.ci/jobs/e2e-testing-pr-mbp.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
---
2+
- job:
3+
name: e2e-tests/e2e-testing-pr-mbp
4+
display-name: End-2-End Tests Pull Request
5+
description: e2e-testing pull requests builds
6+
view: E2E
7+
project-type: multibranch
8+
logrotate:
9+
daysToKeep: 30
10+
numToKeep: 100
11+
number-to-keep: 100
12+
days-to-keep: 30
13+
script-path: .ci/pull-request.groovy
14+
scm:
15+
- github:
16+
branch-discovery: only-pr
17+
# head-filter-regex: '(PR-.*)'
18+
head-filter-regex: '(PR-3169)'
19+
discover-pr-forks-strategy: merge-current
20+
discover-pr-forks-trust: permission
21+
discover-pr-origin: merge-current
22+
discover-tags: false
23+
notification-context: 'beats-ci/e2e-testing-pr'
24+
repo: e2e-testing
25+
repo-owner: elastic
26+
credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken
27+
ssh-checkout:
28+
credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba
29+
build-strategies:
30+
- change-request:
31+
ignore-target-only-changes: true
32+
clean:
33+
after: true
34+
before: true
35+
prune: true
36+
shallow-clone: true
37+
depth: 4
38+
do-not-fetch-tags: true
39+
submodule:
40+
disable: false
41+
recursive: true
42+
parent-credentials: true
43+
timeout: 120
44+
timeout: '15'
45+
use-author: true
46+
wipe-workspace: 'True'
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
---
2+
- job:
3+
name: e2e-tests/e2e-testing-pr-merge-mbp
4+
display-name: End-2-End Tests Pull Request Merge
5+
description: Triggered when we merge a PR to main branches
6+
view: E2E
7+
project-type: multibranch
8+
logrotate:
9+
daysToKeep: 30
10+
numToKeep: 100
11+
number-to-keep: 100
12+
days-to-keep: 30
13+
script-path: .ci/pr-merge.groovy
14+
scm:
15+
- github:
16+
branch-discovery: no-pr
17+
# head-filter-regex: '(main|8\.\d+|7\.17)'
18+
head-filter-regex: '(PR-3169)'
19+
discover-pr-forks-strategy: merge-current
20+
discover-pr-forks-trust: permission
21+
discover-pr-origin: merge-current
22+
discover-tags: true
23+
notification-context: 'beats-ci/e2e-testing-pr-merge'
24+
repo: e2e-testing
25+
repo-owner: elastic
26+
credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken
27+
ssh-checkout:
28+
credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba
29+
build-strategies:
30+
- change-request:
31+
ignore-target-only-changes: true
32+
clean:
33+
after: true
34+
before: true
35+
prune: true
36+
shallow-clone: true
37+
depth: 4
38+
do-not-fetch-tags: true
39+
submodule:
40+
disable: false
41+
recursive: true
42+
parent-credentials: true
43+
timeout: 120
44+
timeout: '15'
45+
use-author: true
46+
wipe-workspace: 'True'

0 commit comments

Comments
 (0)