Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.17] [BK] Migrate batch 1 (Artifact builds) (#182582) #183474

Merged
merged 2 commits into from
May 15, 2024

Conversation

delanni
Copy link
Contributor

@delanni delanni commented May 15, 2024

Backport

This will backport the following commits from main to 7.17:

It's supposed to fix: https://buildkite.com/elastic/kibana-artifacts-snapshot/builds?branch=7.17

Questions ?

Please refer to the Backport tool documentation

## Summary
Migrates batch 1 - artifact builds. The upload aspect wasn't tested,
because it's programmed only to run from `main`, and we didn't want to
interfere with the ongoing releases. This can be tested after the merge.

Verification:
- [x] RREs tested locally
- [x] kibana / artifacts trigger
(https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/87)
- [x] kibana / artifacts container image
(https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/86)
- [x] kibana / artifacts snapshot
(https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/88)
- [x] kibana / artifacts staging
(https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/88)
- [x] 8.13 / 8.14 / 7.17 verification (only a few jobs need to work
here)

Originals:
- kibana / artifacts trigger
[kibana-artifacts-trigger.yml](https://buildkite.com/elastic/kibana-artifacts-trigger)
- kibana / artifacts container image
[kibana-artifacts.yml](https://buildkite.com/elastic/kibana-artifacts-container-image)
- kibana / artifacts snapshot
[kibana-artifacts.yml](https://buildkite.com/elastic/kibana-artifacts-snapshot)
- kibana / artifacts staging
[kibana-artifacts.yml](https://buildkite.com/elastic/kibana-artifacts-staging)

Backports:
 - elastic#182781
 - elastic#182780

The backports don't need to have the pipeline resource definition files,
however, we forked 8.14 off from main, where we already had the
resources. I'll remove all the unnecessary resource defs from the legacy
branches, once we finalize the state (simply to save a little
inconvenience on future backports.)

(cherry picked from commit d5362fd)

# Conflicts:
#	.buildkite/pipeline-resource-definitions/locations.yml
#	.buildkite/pipelines/artifacts.yml
#	.buildkite/pipelines/artifacts_container_image.yml
#	.buildkite/pipelines/artifacts_trigger.yml
@delanni delanni enabled auto-merge (squash) May 15, 2024 08:52
@delanni delanni requested a review from a team May 15, 2024 09:30
…nt additions we run the risk of timing out on a normal build
@delanni delanni disabled auto-merge May 15, 2024 12:04
@delanni delanni merged commit 6e131ab into elastic:7.17 May 15, 2024
21 of 26 checks passed
@delanni
Copy link
Contributor Author

delanni commented May 15, 2024

force merging as this is low risk, and is supposed to fix currently failing builds

@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

✅ unchanged

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

adelisle pushed a commit to Makila-AI/kibana that referenced this pull request Aug 5, 2024
…ic#183474)

# Backport

This will backport the following commits from `main` to `7.17`:
- [[BK] Migrate batch 1 (Artifact builds)
(elastic#182582)](elastic#182582)

It's supposed to fix:
https://buildkite.com/elastic/kibana-artifacts-snapshot/builds?branch=7.17

<!--- Backport version: 8.9.8 -->

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

<!--BACKPORT [{"author":{"name":"Alex
Szabo","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-05-13T14:06:55Z","message":"[BK]
Migrate batch 1 (Artifact builds) (elastic#182582)\n\n## Summary\r\nMigrates
batch 1 - artifact builds. The upload aspect wasn't tested,\r\nbecause
it's programmed only to run from `main`, and we didn't want
to\r\ninterfere with the ongoing releases. This can be tested after the
merge.\r\n\r\nVerification:\r\n- [x] RREs tested locally\r\n- [x] kibana
/ artifacts
trigger\r\n(https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/87)\r\n-
[x] kibana / artifacts container
image\r\n(https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/86)\r\n-
[x] kibana / artifacts
snapshot\r\n(https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/88)\r\n-
[x] kibana / artifacts
staging\r\n(https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/88)\r\n-
[x] 8.13 / 8.14 / 7.17 verification (only a few jobs need to
work\r\nhere)\r\n\r\nOriginals:\r\n- kibana / artifacts
trigger\r\n[kibana-artifacts-trigger.yml](https://buildkite.com/elastic/kibana-artifacts-trigger)\r\n-
kibana / artifacts container
image\r\n[kibana-artifacts.yml](https://buildkite.com/elastic/kibana-artifacts-container-image)\r\n-
kibana / artifacts
snapshot\r\n[kibana-artifacts.yml](https://buildkite.com/elastic/kibana-artifacts-snapshot)\r\n-
kibana / artifacts
staging\r\n[kibana-artifacts.yml](https://buildkite.com/elastic/kibana-artifacts-staging)\r\n\r\nBackports:\r\n
- https://github.com/elastic/kibana/pull/182781\r\n -
https://github.com/elastic/kibana/pull/182780\r\n \r\nThe backports
don't need to have the pipeline resource definition files,\r\nhowever,
we forked 8.14 off from main, where we already had the\r\nresources.
I'll remove all the unnecessary resource defs from the
legacy\r\nbranches, once we finalize the state (simply to save a
little\r\ninconvenience on future
backports.)","sha":"d5362fdaf7da5dd60f26da2ce4c64313c5930317","branchLabelMapping":{"^v8.15.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Operations","release_note:skip","backport:prev-MAJOR","v8.15.0","v7.17.22"],"number":182582,"url":"https://github.com/elastic/kibana/pull/182582","mergeCommit":{"message":"[BK]
Migrate batch 1 (Artifact builds) (elastic#182582)\n\n## Summary\r\nMigrates
batch 1 - artifact builds. The upload aspect wasn't tested,\r\nbecause
it's programmed only to run from `main`, and we didn't want
to\r\ninterfere with the ongoing releases. This can be tested after the
merge.\r\n\r\nVerification:\r\n- [x] RREs tested locally\r\n- [x] kibana
/ artifacts
trigger\r\n(https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/87)\r\n-
[x] kibana / artifacts container
image\r\n(https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/86)\r\n-
[x] kibana / artifacts
snapshot\r\n(https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/88)\r\n-
[x] kibana / artifacts
staging\r\n(https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/88)\r\n-
[x] 8.13 / 8.14 / 7.17 verification (only a few jobs need to
work\r\nhere)\r\n\r\nOriginals:\r\n- kibana / artifacts
trigger\r\n[kibana-artifacts-trigger.yml](https://buildkite.com/elastic/kibana-artifacts-trigger)\r\n-
kibana / artifacts container
image\r\n[kibana-artifacts.yml](https://buildkite.com/elastic/kibana-artifacts-container-image)\r\n-
kibana / artifacts
snapshot\r\n[kibana-artifacts.yml](https://buildkite.com/elastic/kibana-artifacts-snapshot)\r\n-
kibana / artifacts
staging\r\n[kibana-artifacts.yml](https://buildkite.com/elastic/kibana-artifacts-staging)\r\n\r\nBackports:\r\n
- https://github.com/elastic/kibana/pull/182781\r\n -
https://github.com/elastic/kibana/pull/182780\r\n \r\nThe backports
don't need to have the pipeline resource definition files,\r\nhowever,
we forked 8.14 off from main, where we already had the\r\nresources.
I'll remove all the unnecessary resource defs from the
legacy\r\nbranches, once we finalize the state (simply to save a
little\r\ninconvenience on future
backports.)","sha":"d5362fdaf7da5dd60f26da2ce4c64313c5930317"}},"sourceBranch":"main","suggestedTargetBranches":["7.17"],"targetPullRequestStates":[{"branch":"main","label":"v8.15.0","labelRegex":"^v8.15.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/182582","number":182582,"mergeCommit":{"message":"[BK]
Migrate batch 1 (Artifact builds) (elastic#182582)\n\n## Summary\r\nMigrates
batch 1 - artifact builds. The upload aspect wasn't tested,\r\nbecause
it's programmed only to run from `main`, and we didn't want
to\r\ninterfere with the ongoing releases. This can be tested after the
merge.\r\n\r\nVerification:\r\n- [x] RREs tested locally\r\n- [x] kibana
/ artifacts
trigger\r\n(https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/87)\r\n-
[x] kibana / artifacts container
image\r\n(https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/86)\r\n-
[x] kibana / artifacts
snapshot\r\n(https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/88)\r\n-
[x] kibana / artifacts
staging\r\n(https://buildkite.com/elastic/kibana-migration-pipeline-staging/builds/88)\r\n-
[x] 8.13 / 8.14 / 7.17 verification (only a few jobs need to
work\r\nhere)\r\n\r\nOriginals:\r\n- kibana / artifacts
trigger\r\n[kibana-artifacts-trigger.yml](https://buildkite.com/elastic/kibana-artifacts-trigger)\r\n-
kibana / artifacts container
image\r\n[kibana-artifacts.yml](https://buildkite.com/elastic/kibana-artifacts-container-image)\r\n-
kibana / artifacts
snapshot\r\n[kibana-artifacts.yml](https://buildkite.com/elastic/kibana-artifacts-snapshot)\r\n-
kibana / artifacts
staging\r\n[kibana-artifacts.yml](https://buildkite.com/elastic/kibana-artifacts-staging)\r\n\r\nBackports:\r\n
- https://github.com/elastic/kibana/pull/182781\r\n -
https://github.com/elastic/kibana/pull/182780\r\n \r\nThe backports
don't need to have the pipeline resource definition files,\r\nhowever,
we forked 8.14 off from main, where we already had the\r\nresources.
I'll remove all the unnecessary resource defs from the
legacy\r\nbranches, once we finalize the state (simply to save a
little\r\ninconvenience on future
backports.)","sha":"d5362fdaf7da5dd60f26da2ce4c64313c5930317"}},{"branch":"7.17","label":"v7.17.22","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants