Skip to content

[Security Solution] Labels adjustments#181371

Merged
MadameSheema merged 9 commits intoelastic:mainfrom
MadameSheema:cypress/tags-adjustments
Apr 24, 2024
Merged

[Security Solution] Labels adjustments#181371
MadameSheema merged 9 commits intoelastic:mainfrom
MadameSheema:cypress/tags-adjustments

Conversation

@MadameSheema
Copy link
Contributor

@MadameSheema MadameSheema commented Apr 23, 2024

Following up from #180773

Summary

In this PR we are introducing the @skipServerlessMKI label, with it, a test will be excluded from the execution on any MKI environment but it will be executed as part of the CI check if the @serverless tag is present.

With the new changes the serverless labels will work as follows:

  • @serverless: The test is executed as part of the PR check process and in the periodic pipeline (MKI environment).

  • @serverlessQA: The test is executed as part of the kibana release process in the QA environment (MKI environment).

  • @skipInServerless: The test is skipped from being executed in CI as part of the PR check and is skipped from being executed in any MKI environment.

@skipInServerlessMKI: The test is skipped from being executed in any MKI environment but it will continue being executed as part of the PR process if the @serverless tag is present.

IMPORTANT:

The skip labels have been created for those tests that use @serverless or @serverlessQA labels. The absence of them (@serverless or @serverlessQA) will exclude automatically the execution of the test in the targeted environments.

I.E: A test without @serverlessQA will never be executed as part of the Kibana release process. A test without @serverless will never be executed as part of the PR CI check neither the periodic pipeline.

@MadameSheema
Copy link
Contributor Author

/ci

@MadameSheema
Copy link
Contributor Author

/ci

@MadameSheema MadameSheema self-assigned this Apr 23, 2024
@MadameSheema MadameSheema added v8.14.0 release_note:skip Skip the PR/issue when compiling release notes Team: SecuritySolution Security Solutions Team working on SIEM, Endpoint, Timeline, Resolver, etc. labels Apr 23, 2024
@MadameSheema
Copy link
Contributor Author

/ci

@MadameSheema MadameSheema marked this pull request as ready for review April 23, 2024 07:12
@elasticmachine
Copy link
Contributor

Pinging @elastic/security-solution (Team: SecuritySolution)

@MadameSheema MadameSheema requested a review from e40pud April 23, 2024 07:12
Copy link
Contributor

@angorayc angorayc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

@michaelolo24 michaelolo24 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for making these changes @MadameSheema and the clear description!

@MadameSheema
Copy link
Contributor Author

Thanks Glo, could you please update it in this doc as well? https://docs.elastic.dev/security-solution/teams/analyst->experience/automation/serverless/2.labeling.mdx

@angorayc I'll do so as soon as everything reaches production

@MadameSheema MadameSheema enabled auto-merge (squash) April 23, 2024 17:01
@kibana-ci
Copy link

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @MadameSheema

Copy link
Contributor

@banderror banderror left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@MadameSheema MadameSheema merged commit 37d47da into elastic:main Apr 24, 2024
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Apr 24, 2024
Following up from elastic#180773

## Summary

In this PR we are introducing the `@skipServerlessMKI` label, with it, a
test will be excluded from the execution on any MKI environment but it
will be executed as part of the CI check if the `@serverless` tag is
present.

 With the new changes the serverless labels will work as follows:

* `@serverless`: The test is executed as part of the PR check process
and in the periodic pipeline (MKI environment).

* `@serverlessQA`: The test is executed as part of the kibana release
process in the QA environment (MKI environment).

* `@skipInServerless`: The test is skipped from being executed in CI as
part of the PR check and is skipped from being executed in any MKI
environment.

`@skipInServerlessMKI`: The test is skipped from being executed in any
MKI environment but it will continue being executed as part of the PR
process if the `@serverless` tag is present.

 **IMPORTANT:**

The skip labels have been created for those tests that use `@serverless`
or `@serverlessQA` labels. The absence of them (`@serverless` or
`@serverlessQA`) will exclude automatically the execution of the test in
the targeted environments.

I.E: A test without `@serverlessQA` will never be executed as part of
the Kibana release process. A test without `@serverless` will never be
executed as part of the PR CI check neither the periodic pipeline.

(cherry picked from commit 37d47da)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.14

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Apr 24, 2024
# Backport

This will backport the following commits from `main` to `8.14`:
- [[Security Solution] Labels adjustments
(#181371)](#181371)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Gloria
Hornero","email":"gloria.hornero@elastic.co"},"sourceCommit":{"committedDate":"2024-04-24T08:48:30Z","message":"[Security
Solution] Labels adjustments (#181371)\n\nFollowing up from
https://github.com/elastic/kibana/pull/180773\r\n\r\n## Summary\r\n
\r\nIn this PR we are introducing the `@skipServerlessMKI` label, with
it, a\r\ntest will be excluded from the execution on any MKI environment
but it\r\nwill be executed as part of the CI check if the `@serverless`
tag is\r\npresent.\r\n \r\n With the new changes the serverless labels
will work as follows:\r\n \r\n* `@serverless`: The test is executed as
part of the PR check process\r\nand in the periodic pipeline (MKI
environment).\r\n \r\n* `@serverlessQA`: The test is executed as part of
the kibana release\r\nprocess in the QA environment (MKI
environment).\r\n \r\n* `@skipInServerless`: The test is skipped from
being executed in CI as\r\npart of the PR check and is skipped from
being executed in any MKI\r\nenvironment.\r\n
\r\n`@skipInServerlessMKI`: The test is skipped from being executed in
any\r\nMKI environment but it will continue being executed as part of
the PR\r\nprocess if the `@serverless` tag is present.\r\n \r\n
**IMPORTANT:**\r\n \r\nThe skip labels have been created for those tests
that use `@serverless`\r\nor `@serverlessQA` labels. The absence of them
(`@serverless` or\r\n`@serverlessQA`) will exclude automatically the
execution of the test in\r\nthe targeted environments.\r\n \r\nI.E: A
test without `@serverlessQA` will never be executed as part of\r\nthe
Kibana release process. A test without `@serverless` will never
be\r\nexecuted as part of the PR CI check neither the periodic
pipeline.","sha":"37d47da7711710ded8d30f0514f4da2e1810dc8f","branchLabelMapping":{"^v8.15.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:
SecuritySolution","v8.14.0","v8.15.0"],"title":"[Security Solution]
Labels
adjustments","number":181371,"url":"https://github.com/elastic/kibana/pull/181371","mergeCommit":{"message":"[Security
Solution] Labels adjustments (#181371)\n\nFollowing up from
https://github.com/elastic/kibana/pull/180773\r\n\r\n## Summary\r\n
\r\nIn this PR we are introducing the `@skipServerlessMKI` label, with
it, a\r\ntest will be excluded from the execution on any MKI environment
but it\r\nwill be executed as part of the CI check if the `@serverless`
tag is\r\npresent.\r\n \r\n With the new changes the serverless labels
will work as follows:\r\n \r\n* `@serverless`: The test is executed as
part of the PR check process\r\nand in the periodic pipeline (MKI
environment).\r\n \r\n* `@serverlessQA`: The test is executed as part of
the kibana release\r\nprocess in the QA environment (MKI
environment).\r\n \r\n* `@skipInServerless`: The test is skipped from
being executed in CI as\r\npart of the PR check and is skipped from
being executed in any MKI\r\nenvironment.\r\n
\r\n`@skipInServerlessMKI`: The test is skipped from being executed in
any\r\nMKI environment but it will continue being executed as part of
the PR\r\nprocess if the `@serverless` tag is present.\r\n \r\n
**IMPORTANT:**\r\n \r\nThe skip labels have been created for those tests
that use `@serverless`\r\nor `@serverlessQA` labels. The absence of them
(`@serverless` or\r\n`@serverlessQA`) will exclude automatically the
execution of the test in\r\nthe targeted environments.\r\n \r\nI.E: A
test without `@serverlessQA` will never be executed as part of\r\nthe
Kibana release process. A test without `@serverless` will never
be\r\nexecuted as part of the PR CI check neither the periodic
pipeline.","sha":"37d47da7711710ded8d30f0514f4da2e1810dc8f"}},"sourceBranch":"main","suggestedTargetBranches":["8.14"],"targetPullRequestStates":[{"branch":"8.14","label":"v8.14.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.15.0","branchLabelMappingKey":"^v8.15.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/181371","number":181371,"mergeCommit":{"message":"[Security
Solution] Labels adjustments (#181371)\n\nFollowing up from
https://github.com/elastic/kibana/pull/180773\r\n\r\n## Summary\r\n
\r\nIn this PR we are introducing the `@skipServerlessMKI` label, with
it, a\r\ntest will be excluded from the execution on any MKI environment
but it\r\nwill be executed as part of the CI check if the `@serverless`
tag is\r\npresent.\r\n \r\n With the new changes the serverless labels
will work as follows:\r\n \r\n* `@serverless`: The test is executed as
part of the PR check process\r\nand in the periodic pipeline (MKI
environment).\r\n \r\n* `@serverlessQA`: The test is executed as part of
the kibana release\r\nprocess in the QA environment (MKI
environment).\r\n \r\n* `@skipInServerless`: The test is skipped from
being executed in CI as\r\npart of the PR check and is skipped from
being executed in any MKI\r\nenvironment.\r\n
\r\n`@skipInServerlessMKI`: The test is skipped from being executed in
any\r\nMKI environment but it will continue being executed as part of
the PR\r\nprocess if the `@serverless` tag is present.\r\n \r\n
**IMPORTANT:**\r\n \r\nThe skip labels have been created for those tests
that use `@serverless`\r\nor `@serverlessQA` labels. The absence of them
(`@serverless` or\r\n`@serverlessQA`) will exclude automatically the
execution of the test in\r\nthe targeted environments.\r\n \r\nI.E: A
test without `@serverlessQA` will never be executed as part of\r\nthe
Kibana release process. A test without `@serverless` will never
be\r\nexecuted as part of the PR CI check neither the periodic
pipeline.","sha":"37d47da7711710ded8d30f0514f4da2e1810dc8f"}}]}]
BACKPORT-->

Co-authored-by: Gloria Hornero <gloria.hornero@elastic.co>
@MadameSheema MadameSheema deleted the cypress/tags-adjustments branch June 28, 2024 10:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release_note:skip Skip the PR/issue when compiling release notes Team: SecuritySolution Security Solutions Team working on SIEM, Endpoint, Timeline, Resolver, etc. v8.14.0 v8.15.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.