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

[master] Fix esArchiver path in the Jenkins workspace #102095

Merged

Conversation

cavokz
Copy link
Contributor

@cavokz cavokz commented Jun 14, 2021

Fix after #101345 and #101737.

@cavokz cavokz added release_note:skip Skip the PR/issue when compiling release notes v8.0.0 labels Jun 14, 2021
@cavokz cavokz requested review from spalger and removed request for LeeDr and MadameSheema June 14, 2021 19:27
@cavokz cavokz changed the title Fix esArchiver path in the Jenkins context Fix esArchiver path in the Jenkins workspace Jun 14, 2021
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, was wondering if that was going to be necessary at some point.

@cavokz cavokz added the auto-backport Deprecated - use backport:version if exact versions are needed label Jun 14, 2021
@cavokz
Copy link
Contributor Author

cavokz commented Jun 14, 2021

LGTM, was wondering if that was going to be necessary at some point.

It was not obvious to me it would be needed but at least I learned something new of our CI also today.

@cavokz cavokz merged commit 8bdc0d7 into elastic:master Jun 14, 2021
@cavokz cavokz deleted the fix-es_archiver-path-in-the-Jenkins-context branch June 14, 2021 19:32
@cavokz cavokz changed the title Fix esArchiver path in the Jenkins workspace [master] Fix esArchiver path in the Jenkins workspace Jun 14, 2021
@kibanamachine
Copy link
Contributor

💔 Backport failed

The backport operation could not be completed due to the following error:
There are no branches to backport to. Aborting.

The backport PRs will be merged automatically after passing CI.

To backport manually run:
node scripts/backport --pr 102095

@cavokz cavokz added v7.14.0 auto-backport Deprecated - use backport:version if exact versions are needed and removed auto-backport Deprecated - use backport:version if exact versions are needed labels Jun 14, 2021
@kibanamachine
Copy link
Contributor

💚 Backport successful

Status Branch Result
7.x

This backport PR will be merged automatically after passing CI.

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Jun 14, 2021
Copy link
Contributor

@LeeDr LeeDr left a comment

Choose a reason for hiding this comment

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

I'm a little confused by the diffs because the "old" versions look different than what I see in master? But I think loading the esArchives already work OK both locally and in Jenkins because of how we set the esArchive folder in the config file.
But to load data in the remote cluster you probably do want to set INTEGRATION_TEST_ROOT within the test file and use it in the path

const ARCHIVE = resolve(
INTEGRATION_TEST_ROOT,
'test/es_archives/email_connectors_with_encryption_rotation'
);
Copy link
Contributor

Choose a reason for hiding this comment

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

Some of these existing tests shouldn't need this change because they're loading data into the local cluster and esArchive already works for that. This test gets the correct path because of the INTEGRATION_TEST_ROOT defined in the config file.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There is no more esArchive path in the config.

@@ -15,7 +20,7 @@ export default function ({ getService, getPageObjects, updateBaselines }) {

describe('check metricbeat Dashboard', function () {
before(async function () {
await esArchiver.load('../integration-test/test/es_archives/metricbeat');
await esArchiver.load(ARCHIVE);
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think we need any change here. The current version that just does await esArchiver.load('metricbeat'); should work both locally and in Jenkins.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

await esArchiver.load('metricbeat'); does not work any more after #101345, a path relative to kibana/ or an absolute path is now needed.

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

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

kibanamachine added a commit that referenced this pull request Jun 14, 2021
Co-authored-by: Domenico Andreoli <domenico.andreoli@elastic.co>
cuff-links pushed a commit to cuff-links/kibana that referenced this pull request Jun 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Deprecated - use backport:version if exact versions are needed release_note:skip Skip the PR/issue when compiling release notes v7.14.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants