This repository was archived by the owner on Sep 17, 2024. It is now read-only.
CI: separate JJBB definitions for pull requests, PR merge and external e2e calls #3253
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| --- | ||
|
Contributor
There was a problem hiding this comment. create a new job from scratch |
||
| - job: | ||
| name: e2e-tests/e2e-testing-mbp | ||
| 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|8\.\d+|7\.17|feature-.*)' | ||
|
Contributor
There was a problem hiding this comment. 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. 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
Author
There was a problem hiding this comment. @kuisathaverat Great solution! Could you please take a look now?
Contributor
There was a problem hiding this comment. 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. 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 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| --- | ||
| - 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-.*)' | ||
| head-filter-regex: '(PR-3169)' | ||
| discover-pr-forks-strategy: merge-current | ||
| discover-pr-forks-trust: permission | ||
| discover-pr-origin: merge-current | ||
| discover-tags: false | ||
| 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' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| --- | ||
| - 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/pr-merge.groovy | ||
| scm: | ||
| - github: | ||
| branch-discovery: no-pr | ||
| # head-filter-regex: '(main|8\.\d+|7\.17)' | ||
| head-filter-regex: '(PR-3169)' | ||
| 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-merge' | ||
| 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' |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
no here