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

[CI] Restore old version_info behavior when .git directory is present #101642

Merged
merged 5 commits into from
Jun 8, 2021
Merged

[CI] Restore old version_info behavior when .git directory is present #101642

merged 5 commits into from
Jun 8, 2021

Conversation

brianseeders
Copy link
Contributor

@brianseeders brianseeders commented Jun 8, 2021 •
edited
Loading

When Kibana is built by a job that has a GIT_COMMIT env variable relating to a different repo (e.g. release-manager), the wrong sha is being used.

This should respond the old behavior whenever the .git directory is present.

@brianseeders brianseeders added Feature:CI Continuous integration release_note:skip Skip the PR/issue when compiling release notes v8.0.0 Team:Operations Team label for Operations Team v7.13.0 v7.14.0 auto-backport Deprecated - use backport:version if exact versions are needed labels Jun 8, 2021
@liza-mae liza-mae mentioned this pull request Jun 8, 2021
Closed
@brianseeders brianseeders marked this pull request as ready for review June 8, 2021 20:04
@brianseeders brianseeders requested a review from a team as a code owner June 8, 2021 20:04
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-operations (Team:Operations)

@brianseeders brianseeders requested a review from spalger June 8, 2021 21:01
spalger
spalger approved these changes Jun 8, 2021
View reviewed changes
Copy link
Contributor

@spalger spalger left a comment

Choose a reason for hiding this comment

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

LGTM

@brianseeders brianseeders enabled auto-merge (squash) June 8, 2021 21:43
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

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

@brianseeders brianseeders merged commit e2d75c2 into elastic:master Jun 8, 2021
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Jun 8, 2021
@brianseeders @kibanamachine
[CI] Restore old version_info behavior when .git directory is present (…
68db707 
…elastic#101642)
@kibanamachine kibanamachine mentioned this pull request Jun 8, 2021
Merged
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Jun 8, 2021
@brianseeders @kibanamachine
[CI] Restore old version_info behavior when .git directory is present (…
56dedb9 
…elastic#101642)
@kibanamachine kibanamachine mentioned this pull request Jun 8, 2021
Merged
@kibanamachine
Copy link
Contributor

💚 Backport successful

Status Branch Result
✅ 7.13
✅ 7.x

The backport PRs will be merged automatically after passing CI.

kibanamachine added a commit that referenced this pull request Jun 9, 2021
@kibanamachine @brianseeders
[CI] Restore old version_info behavior when .git directory is present (…
e550369 
…#101642) (#101686)

Co-authored-by: Brian Seeders <brian.seeders@elastic.co>
kibanamachine added a commit that referenced this pull request Jun 9, 2021
@kibanamachine @brianseeders
[CI] Restore old version_info behavior when .git directory is present (…
a32629c 
…#101642) (#101687)

Co-authored-by: Brian Seeders <brian.seeders@elastic.co>
gmmorris added a commit to gmmorris/kibana that referenced this pull request Jun 9, 2021
@gmmorris
Merge branch 'master' into task-manager/capacity-estimation
0270133 
* master: (54 commits)
  Implement "select all" rules feature (elastic#100554)
  [ML] Remove script fields from the Anomaly detection alerting rule executor  (elastic#101607)
  [Security solutions][Endpoint] Update event filtering texts (elastic#101563)
  [Enterprise Search] Mocks/tests tech debt - avoid hungry mocking (elastic#101107)
  [FTR] Updates esArchive paths
  [FTR] Updates esArchive paths
  [Security Solution][Detection Engine] Adds runtime field tests (elastic#101664)
  Added APM PHP agent to the list of agent names (elastic#101062)
  [CI] Restore old version_info behavior when .git directory is present (elastic#101642)
  [Fleet] Add fleet server telemetry (elastic#101400)
  [APM] Syncs agent config settings to APM Fleet policies (elastic#100744)
  [esArchiver] drop support for --dir, use repo-relative paths instead (elastic#101345)
  Revert "[xpack/test] restore incremental: false in ts project"
  [Security Solution] Remove Host Isolation feature flag (elastic#101655)
  [xpack/test] restore incremental: false in ts project
  [DOCS] Adds link to video landing page (elastic#101413)
  [ML] Move Index Data Visualizer into separate plugin (Part 1) (elastic#100922)
  Improve security plugin return types (elastic#101492)
  [ts] migrate `x-pack/test` to composite ts project (elastic#101441)
  [App Search] Updated Search UI to new URL (elastic#101320)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spalger spalger spalger approved these changes

@jbudz jbudz jbudz approved these changes

Assignees
No one assigned
Labels
auto-backport Deprecated - use backport:version if exact versions are needed Feature:CI Continuous integration release_note:skip Skip the PR/issue when compiling release notes Team:Operations Team label for Operations Team v7.13.0 v7.14.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@brianseeders @elasticmachine @kibanamachine @spalger @jbudz