[kbn-test] convert kibana-install-dir flag to installDir option #21317

spalger · 2018-07-26T22:10:36Z

Fixes #20922

Based on the variable that's extracted from the options object in https://github.com/elastic/kibana/blob/master/packages/kbn-test/src/functional_tests/lib/run_kibana_server.js#L24 the --kibana-install-dir flag is expected to be the installDir option, but it's not being transformed as such by the cli/run_tests/args module. This updated the processOptions() function to convert the kibana-install-dir option to installDir, which should get the functional tests running against the build output again.

rhoboat · 2018-07-26T22:39:28Z

packages/kbn-test/src/functional_tests/cli/run_tests/args.js

+    userOptions.installDir = userOptions['kibana-install-dir'];
+    delete userOptions['kibana-install-dir'];
+  }
+


These lines need to be added to https://github.com/elastic/kibana/blob/master/packages/kbn-test/src/functional_tests/cli/start_servers/args.js#L82

rhoboat

Left a comment

elasticmachine · 2018-07-27T00:52:27Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

rhoboat · 2018-07-27T17:08:23Z

retest

This reverts commit e5b94aa.

…utable

…eded Adding a `webpack.DefinePlugin` slows down the optimizer a small amount, so only apply it when it is necessary, and skip it if it is going to be defined as "false".

…a-install-dir

elasticmachine · 2018-07-27T21:36:57Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

…nning build_snapshot

elasticmachine · 2018-07-28T00:19:48Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request

spalger · 2018-08-01T22:00:23Z

@archanid this is ready for another look if you have a chance

…a-install-dir

elasticmachine · 2018-08-01T23:32:12Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request

rhoboat · 2018-08-02T13:35:52Z

node scripts/functional_tests_server --config test/functional/config.js --kibana-install-dir ./build/kibana

gives me Error: Cannot find module '../../package.json'. It's looking for package.json in the build/kibana directory. Locally I don't have that. Is it created in the build?

rhoboat · 2018-08-02T17:01:55Z

How to test, to save people time:

run node scripts/kibana
extract build from target/ dir
try node scripts/functional_tests_server --kibana-install-dir ./path/to/extracted/build
make sure kibana starts up from build

rhoboat · 2018-08-02T17:54:42Z

packages/kbn-test/src/functional_tests/tasks.js

@@ -76,7 +76,7 @@ export async function startServers(options) {
      config,
      options: {
        ...opts,
-        extraKbnOpts: [...options.extraKbnOpts, '--dev'],
+        extraKbnOpts: [...options.extraKbnOpts, ...(options.installDir ? [] : ['--dev'])],


Is there an explanation for this? I'm curious...

The distributable doesn't support the --dev flag, it's only available when running from source.

rhoboat · 2018-08-02T17:54:55Z

scripts/functional_tests.js

@@ -18,7 +18,7 @@
 */

 require('../src/setup_node_env');
-require('../packages/kbn-test').runTestsCli([
+require('@kbn/test').runTestsCli([


rhoboat · 2018-08-02T17:55:13Z

test/common/services/kibana_server/version.js

@@ -30,7 +30,7 @@ export class KibanaServerVersion {

    const status = await this.kibanaStatus.get();
    if (status && status.version && status.version.number) {
-      this._cachedVersionNumber = status.version.number;
+      this._cachedVersionNumber = status.version.number + (status.version.build_snapshot ? '-SNAPSHOT' : '');


What's the reason for this change, also?

So this change just fixes the kibanaServer.version.get() method to properly mirror the version information used in the Kibana server by relying on the build_snapshot property in the API response.

This was necessary because the RBAC tests are the only thing relying on this method right now, and they were added while we weren't testing against the distributable, so they started failing when we fixed the --kibana-install-dir flag.

rhoboat

Works fine. Just some questions about two things in the code changes.

…tic#21317) * [kbn-test] convert kibana-install-dir flag to installDir option * [kbn-test] replicate kibana-install-dir handling to startServers * [ftr] try running functional tests in production in CI * Revert "[ftr] try running functional tests in production in CI" This reverts commit e5b94aa. * [core/public/legacyPlatform] exclude ui/test_harness from the distributable * [optimizer] fix `process.env.IS_KIBANA_DISTRIBUTABLE` definition * [optimizer] only define `process.env.IS_KIBANA_DISTRIBUTABLE` when needed Adding a `webpack.DefinePlugin` slows down the optimizer a small amount, so only apply it when it is necessary, and skip it if it is going to be defined as "false". * [kbn-test/startServer] don't run in --dev mode if running from dist * [ftr/kibanaServer/version] attach `-SNAPSHOT` suffix to version if running build_snapshot

…) (#21626) * [kbn-test] convert kibana-install-dir flag to installDir option * [kbn-test] replicate kibana-install-dir handling to startServers * [ftr] try running functional tests in production in CI * Revert "[ftr] try running functional tests in production in CI" This reverts commit e5b94aa. * [core/public/legacyPlatform] exclude ui/test_harness from the distributable * [optimizer] fix `process.env.IS_KIBANA_DISTRIBUTABLE` definition * [optimizer] only define `process.env.IS_KIBANA_DISTRIBUTABLE` when needed Adding a `webpack.DefinePlugin` slows down the optimizer a small amount, so only apply it when it is necessary, and skip it if it is going to be defined as "false". * [kbn-test/startServer] don't run in --dev mode if running from dist * [ftr/kibanaServer/version] attach `-SNAPSHOT` suffix to version if running build_snapshot

…#21317) (#21627) Backports the following commits to 6.4: - [kbn-test] convert kibana-install-dir flag to installDir option (#21317)

spalger · 2018-08-03T02:33:46Z

6.x/6.5: 0f12ecf
6.4: c937beb

[kbn-test] convert kibana-install-dir flag to installDir option

22cb1bc

spalger added review Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc v7.0.0 v6.4.0 v6.5.0 labels Jul 26, 2018

spalger requested a review from rhoboat July 26, 2018 22:10

rhoboat reviewed Jul 26, 2018

View reviewed changes

rhoboat suggested changes Jul 26, 2018

View reviewed changes

spalger added 2 commits July 26, 2018 16:26

[kbn-test] replicate kibana-install-dir handling to startServers

ff5cfbd

[ftr] try running functional tests in production in CI

e5b94aa

elastic deleted a comment from elasticmachine Jul 26, 2018

spalger force-pushed the fix/ftr/kibana-install-dir branch 3 times, most recently from ec533f5 to 37983ba Compare July 27, 2018 17:34

spalger added 2 commits July 27, 2018 10:34

Revert "[ftr] try running functional tests in production in CI"

8937342

This reverts commit e5b94aa.

[core/public/legacyPlatform] exclude ui/test_harness from the distrib…

ac0749b

…utable

spalger force-pushed the fix/ftr/kibana-install-dir branch from 37983ba to ac0749b Compare July 27, 2018 17:35

[optimizer] fix process.env.IS_KIBANA_DISTRIBUTABLE definition

5d3a8bf

elastic deleted a comment from elasticmachine Jul 27, 2018

spalger added 2 commits July 27, 2018 12:26

[optimizer] only define process.env.IS_KIBANA_DISTRIBUTABLE when ne…

fef209e

…eded Adding a `webpack.DefinePlugin` slows down the optimizer a small amount, so only apply it when it is necessary, and skip it if it is going to be defined as "false".

Merge branch 'master' of github.com:elastic/kibana into fix/ftr/kiban…

8bc3a57

…a-install-dir

spalger added 2 commits July 27, 2018 15:50

[kbn-test/startServer] don't run in --dev mode if running from dist

4e89e26

[ftr/kibanaServer/version] attach -SNAPSHOT suffix to version if ru…

6f13086

…nning build_snapshot

Merge branch 'master' of github.com:elastic/kibana into fix/ftr/kiban…

5a2104d

…a-install-dir

rhoboat reviewed Aug 2, 2018

View reviewed changes

spalger merged commit 4f0d2ad into elastic:master Aug 3, 2018

spalger mentioned this pull request Aug 3, 2018

[6.x] [kbn-test] convert kibana-install-dir flag to installDir option (#21317) #21626

Merged

spalger mentioned this pull request Aug 3, 2018

[6.4] [kbn-test] convert kibana-install-dir flag to installDir option (#21317) #21627

Merged

spalger pushed a commit that referenced this pull request Aug 3, 2018

[6.4] [kbn-test] convert kibana-install-dir flag to installDir option (…

c937beb

…#21317) (#21627) Backports the following commits to 6.4: - [kbn-test] convert kibana-install-dir flag to installDir option (#21317)

spalger deleted the fix/ftr/kibana-install-dir branch August 3, 2018 02:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[kbn-test] convert kibana-install-dir flag to installDir option #21317

[kbn-test] convert kibana-install-dir flag to installDir option #21317

spalger commented Jul 26, 2018 •

edited

Loading

rhoboat Jul 26, 2018

rhoboat left a comment

elasticmachine commented Jul 27, 2018

rhoboat commented Jul 27, 2018

elasticmachine commented Jul 27, 2018

elasticmachine commented Jul 28, 2018

spalger commented Aug 1, 2018

elasticmachine commented Aug 1, 2018

rhoboat commented Aug 2, 2018

rhoboat commented Aug 2, 2018

rhoboat Aug 2, 2018

spalger Aug 3, 2018

rhoboat Aug 2, 2018

rhoboat Aug 2, 2018

spalger Aug 3, 2018

rhoboat left a comment

spalger commented Aug 3, 2018

[kbn-test] convert kibana-install-dir flag to installDir option #21317

[kbn-test] convert kibana-install-dir flag to installDir option #21317

Conversation

spalger commented Jul 26, 2018 • edited Loading

rhoboat Jul 26, 2018

Choose a reason for hiding this comment

rhoboat left a comment

Choose a reason for hiding this comment

elasticmachine commented Jul 27, 2018

💔 Build Failed

rhoboat commented Jul 27, 2018

elasticmachine commented Jul 27, 2018

💔 Build Failed

elasticmachine commented Jul 28, 2018

💚 Build Succeeded

spalger commented Aug 1, 2018

elasticmachine commented Aug 1, 2018

💚 Build Succeeded

rhoboat commented Aug 2, 2018

rhoboat commented Aug 2, 2018

rhoboat Aug 2, 2018

Choose a reason for hiding this comment

spalger Aug 3, 2018

Choose a reason for hiding this comment

rhoboat Aug 2, 2018

Choose a reason for hiding this comment

rhoboat Aug 2, 2018

Choose a reason for hiding this comment

spalger Aug 3, 2018

Choose a reason for hiding this comment

rhoboat left a comment

Choose a reason for hiding this comment

spalger commented Aug 3, 2018

spalger commented Jul 26, 2018 •

edited

Loading