-
Notifications
You must be signed in to change notification settings - Fork 39
CI: separate JJBB definitions for pull requests, PR merge and external e2e calls #3253
Changes from 2 commits
6a9efe1
7f4bee9
bc74f30
20c7aef
d4320ff
13468d4
1d543a2
c0a88d3
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| --- | ||
| - job: | ||
| name: e2e-tests/e2e-testing-mbp | ||
| display-name: End-2-End Tests Pipeline | ||
| description: Jenkins pipeline for the e2e-testing project | ||
| display-name: End-2-End Tests Pipeline for external calls | ||
| description: This pipeline can be only called from other repositories | ||
| view: E2E | ||
| project-type: multibranch | ||
| logrotate: | ||
|
|
@@ -13,8 +13,11 @@ | |
| script-path: .ci/Jenkinsfile | ||
| scm: | ||
| - github: | ||
| property-strategies: | ||
| all-branches: | ||
| - suppress-scm-triggering: true | ||
| branch-discovery: no-pr | ||
| head-filter-regex: '(main|PR-.*|8\.\d+|7\.17|feature-.*)' | ||
| head-filter-regex: '(main|8\.\d+|7\.17|feature-.*)' | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this changes the current behavior on the stable branch without a change in the pipelines, this breaks the CI. the PR will not be processed until all new pipelines are develop.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. A proposal here, do not touch the main pipeline (.ci/jobs/e2e-testing-mbp.yml) until everything is working. So, create a new file like this one with a different
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. WYT @v1v
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @kuisathaverat Great solution! Could you please take a look now?
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we still making changes in .ci/jobs/e2e-testing-mbp.yml that is something we do not want
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. limit the branches to your working branches and PRs |
||
| discover-pr-forks-strategy: merge-current | ||
| discover-pr-forks-trust: permission | ||
| discover-pr-origin: merge-current | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| --- | ||
| - job: | ||
| name: e2e-tests/e2e-testing-pr-mbp | ||
| display-name: End-2-End Tests Pull Request | ||
| description: e2e-testing pull requests builds | ||
| view: E2E | ||
| project-type: multibranch | ||
| logrotate: | ||
| daysToKeep: 30 | ||
| numToKeep: 100 | ||
| number-to-keep: 100 | ||
| days-to-keep: 30 | ||
| script-path: .ci/pull-request.groovy | ||
| scm: | ||
| - github: | ||
| branch-discovery: no-pr | ||
| head-filter-regex: '(PR-.*)' | ||
| discover-pr-forks-strategy: merge-current | ||
| discover-pr-forks-trust: permission | ||
| discover-pr-origin: merge-current | ||
| discover-tags: true | ||
|
kuisathaverat marked this conversation as resolved.
Outdated
|
||
| notification-context: 'beats-ci/e2e-testing-pr' | ||
| repo: e2e-testing | ||
| repo-owner: elastic | ||
| credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken | ||
| ssh-checkout: | ||
| credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba | ||
| build-strategies: | ||
| - change-request: | ||
| ignore-target-only-changes: true | ||
| clean: | ||
| after: true | ||
| before: true | ||
| prune: true | ||
| shallow-clone: true | ||
| depth: 4 | ||
| do-not-fetch-tags: true | ||
| submodule: | ||
| disable: false | ||
| recursive: true | ||
| parent-credentials: true | ||
| timeout: 120 | ||
| timeout: '15' | ||
| use-author: true | ||
| wipe-workspace: 'True' | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| --- | ||
| - job: | ||
| name: e2e-tests/e2e-testing-pr-mbp | ||
| display-name: End-2-End Tests Pull Request Merge | ||
| description: Triggered when we merge a PR to main branches | ||
| view: E2E | ||
| project-type: multibranch | ||
| logrotate: | ||
| daysToKeep: 30 | ||
| numToKeep: 100 | ||
| number-to-keep: 100 | ||
| days-to-keep: 30 | ||
| script-path: .ci/pull-request.groovy | ||
|
kuisathaverat marked this conversation as resolved.
Outdated
|
||
| scm: | ||
| - github: | ||
| branch-discovery: no-pr | ||
| head-filter-regex: '(main|8\.\d+|7\.17)' | ||
| discover-pr-forks-strategy: merge-current | ||
| discover-pr-forks-trust: permission | ||
| discover-pr-origin: merge-current | ||
| discover-tags: true | ||
| notification-context: 'beats-ci/e2e-testing-pr' | ||
| repo: e2e-testing | ||
| repo-owner: elastic | ||
| credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken | ||
| ssh-checkout: | ||
| credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba | ||
| build-strategies: | ||
| - change-request: | ||
| ignore-target-only-changes: true | ||
| clean: | ||
| after: true | ||
| before: true | ||
| prune: true | ||
| shallow-clone: true | ||
| depth: 4 | ||
| do-not-fetch-tags: true | ||
| submodule: | ||
| disable: false | ||
| recursive: true | ||
| parent-credentials: true | ||
| timeout: 120 | ||
| timeout: '15' | ||
| use-author: true | ||
| wipe-workspace: 'True' | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
create a new job from scratch