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.

Sign up for GitHub

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

Jump to bottom

[Fleet] Use staging registry for snapshot builds #90327

Merged
merged 2 commits into from
Feb 10, 2021
Merged

[Fleet] Use staging registry for snapshot builds #90327

merged 2 commits into from
Feb 10, 2021

Conversation

ruflin
Copy link
Member

@ruflin ruflin commented Feb 4, 2021

The staging registry is used in Kibana builds which are not built of the master branch or release version. This means, any build ending with -SNAPSHOT not the master branch will use the staging registry.

Closes #90131

@ruflin
[Fleet] Use staging registry for snapshot builds
f956da1 
The staging registry is used in Kibana builds which are not built of the master branch or release version. This means, any build ending with `-SNAPSHOT` not the master branch will use the staging registry.

Closes elastic#90131
@ruflin ruflin added the Team:Fleet Team label for Observability Data Collection Fleet team label Feb 4, 2021
@ruflin ruflin self-assigned this Feb 4, 2021
@ruflin
Copy link
Member Author

ruflin commented Feb 4, 2021

@skh I'm struggling a bit with testing this. I tried to modify the package.json and adjust version / branch but this had many unexpected side effects as the values are also used in other places. I maybe have to cherry pick it to the 7.x branch for testing. But then I still miss -SNAPSHOT in the version.

@spalger
Copy link
Contributor

spalger commented Feb 4, 2021

jenkins test this

@skh
Copy link
Contributor

skh commented Feb 8, 2021 •
edited
Loading

I maybe have to cherry pick it to the 7.x branch for testing. But then I still miss -SNAPSHOT in the version.

I have tested this locally on the 7.x branch. If you run kibana with yarn start, kibanaVersion does indeed not contain -SNAPSHOT. If you build locally with yarn build, the -SNAPSHOT string is added. This does make manual testing a bit cumbersome indeed -- as the code is rather straightforward, it might make sense merging it soon, and testing it with the snapshot builds we get from https://artifacts-api.elastic.co/.

@jen-huang jen-huang marked this pull request as ready for review February 10, 2021 00:27
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@jen-huang jen-huang added release_note:skip Skip the PR/issue when compiling release notes v7.12.0 v8.0.0 labels Feb 10, 2021
jen-huang
jen-huang approved these changes Feb 10, 2021
View reviewed changes
Copy link
Contributor

@jen-huang jen-huang left a comment

Choose a reason for hiding this comment

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

Approving per @skh's comment (thanks for testing Sonja!).

@jen-huang jen-huang mentioned this pull request Feb 10, 2021
Closed
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

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

@skh skh merged commit 634c0b3 into elastic:master Feb 10, 2021
skh pushed a commit to skh/kibana that referenced this pull request Feb 10, 2021
@ruflin @jen-huang @skh
[Fleet] Use staging registry for snapshot builds (elastic#90327)
2b7b1c8 
The staging registry is used in Kibana builds which are not built of the master branch or release version. This means, any build ending with `-SNAPSHOT` not the master branch will use the staging registry.

Closes elastic#90131

Co-authored-by: Jen Huang <its.jenetic@gmail.com>
@skh skh mentioned this pull request Feb 10, 2021
Merged
skh added a commit that referenced this pull request Feb 10, 2021
@skh @ruflin @jen-huang
[Fleet] Use staging registry for snapshot builds (#90327) (#90911)
d3c4f47 
The staging registry is used in Kibana builds which are not built of the master branch or release version. This means, any build ending with `-SNAPSHOT` not the master branch will use the staging registry.

Closes #90131

Co-authored-by: Jen Huang <its.jenetic@gmail.com>

Co-authored-by: Nicolas Ruflin <spam@ruflin.com>
Co-authored-by: Jen Huang <its.jenetic@gmail.com>
gmmorris added a commit to gmmorris/kibana that referenced this pull request Feb 10, 2021
@gmmorris
Merge branch 'master' into task-manager/support-limited-concurrency
e92a164 
* master: (99 commits)
  [Fleet] Use Fleet Server indices in the search bar (elastic#90835)
  [Search Sessions] added an info flyout to session management (elastic#90559)
  [ILM] Revisit searchable snapshot field after new redesign (elastic#90793)
  [Alerting] License Errors on Alert List View (elastic#89920)
  RFC Improve saved object migrations algorithm (elastic#84333)
  [Lens] (Accessibility) Fix focus on drag and drop actions (elastic#90561)
  Use new shortcut links to Fleet discuss forums. (elastic#90786)
  Do not generate an ephemeral encryption key in production. (elastic#81511)
  [Fleet] Use staging registry for snapshot builds (elastic#90327)
  Actually deleting x-pack/tsconfig.refs.json (elastic#90898)
  Add deprecation warning to all Beats CM pages. (elastic#90741)
  skip flaky suite (elastic#90136)
  Revert "Revert "[Metrics UI] Add Metrics Anomaly Alert Type (elastic#89244)"" (elastic#90889)
  remove ref to removed tsconfig file
  [core.logging] Uses host timezone as default (elastic#90368)
  [Maps] remove maps_file_upload plugin and fold public folder into file_upload plugin (elastic#90292)
  Revert "[Metrics UI] Add Metrics Anomaly Alert Type (elastic#89244)"
  [dev-utils/ci-stats] support disabling ship errors (elastic#90851)
  Prefix with / (elastic#90836)
  [Metrics UI] Add Metrics Anomaly Alert Type (elastic#89244)
  ...
@skh skh added the v7.11.1 label Feb 11, 2021
@skh skh mentioned this pull request Feb 11, 2021
Merged
skh pushed a commit to skh/kibana that referenced this pull request Feb 11, 2021
@ruflin @skh
[Fleet] Use staging registry for snapshot builds (elastic#90327)
6ba3876 
The staging registry is used in Kibana builds which are not built of the master branch or release version. This means, any build ending with `-SNAPSHOT` not the master branch will use the staging registry.

Closes elastic#90131

Co-authored-by: Jen Huang <its.jenetic@gmail.com>
# Conflicts:
#	x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts
skh added a commit that referenced this pull request Feb 11, 2021
@skh @ruflin
[Fleet] Use staging registry for snapshot builds (#90327) (#91088)
de3994a 
The staging registry is used in Kibana builds which are not built of the master branch or release version. This means, any build ending with `-SNAPSHOT` not the master branch will use the staging registry.

Closes #90131

Co-authored-by: Jen Huang <its.jenetic@gmail.com>
# Conflicts:
#	x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts

Co-authored-by: Nicolas Ruflin <spam@ruflin.com>
@LeeDr LeeDr added v7.11.2 and removed v7.11.1 labels Feb 11, 2021
@LeeDr
Copy link

LeeDr commented Feb 11, 2021

I'm pretty sure this missed the 7.11.1 build of Kibana with hash 6882b06 so I changed the label to v7.11.2 but correct me if that's wrong.

@skh
Copy link
Contributor

skh commented Feb 11, 2021

Thanks @LeeDr.

@EricDavisX
Copy link
Contributor

The Kibana repo had / has another urgent check-in coming for 7.11.1 so this will be picked up as well.

@ruflin ruflin deleted the staging-registry-cdn branch February 15, 2021 10:21
@ruflin
Copy link
Member Author

ruflin commented Feb 15, 2021

@skh Thanks for taking this over!

@EricDavisX EricDavisX mentioned this pull request Feb 16, 2021
Merged
@kuisathaverat kuisathaverat mentioned this pull request Feb 24, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jen-huang jen-huang jen-huang approved these changes

Assignees

@ruflin ruflin

Labels
release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.11.1 v7.12.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Fleet] Use staging registry for SNAPSHOT builds
8 participants
@ruflin @spalger @skh @elasticmachine @kibanamachine @LeeDr @EricDavisX @jen-huang