Option to run kibana from build for CI #19125

rhoboat · 2018-05-16T14:30:31Z

@spalger pointed out that the code for running kibana from an installation (build) for x-pack tests was bumped out with #18568 merging with opening-xpack.

These files show the flow that we used to run from build:

kibana/x-pack/dev-tools/functional_tests/lib/run_kibana_server.js

Lines 36 to 42 in 2f0b420

    
           const runFromSourceArgs = existingInstallDir 
        
             ? ['--optimize.useBundleCache=true'] 
        
             : [ 
        
               KIBANA_SCRIPT_PATH, 
        
               '--no-base-path', 
        
               `--optimize.bundleDir=${OPTIMIZE_BUNDLE_DIR}`, 
        
             ];

kibana/x-pack/dev-tools/functional_tests/tasks.js

Lines 46 to 49 in 2f0b420

    
           .option( 
        
             '--kibana-install-dir <path>', 
        
             'Run Kibana from an existing install directory' 
        
           )

kibana/test/scripts/jenkins_xpack.sh

Lines 29 to 47 in 2f0b420

    
           echo " -> building and extracting default Kibana distributable for use in functional tests" 
        
           cd "$KIBANA_DIR" 
        
           node scripts/build --debug --no-oss 
        
           linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')" 
        
           installDir="$PARENT_DIR/install/kibana" 
        
           mkdir -p "$installDir" 
        
           tar -xzf "$linuxBuild" -C "$installDir" --strip=1 
        
           echo " -> Running api integration tests" 
        
           cd "$XPACK_DIR" 
        
           node scripts/functional_tests_api --kibana-install-dir "$installDir" --es-from=source 
        
           echo "" 
        
           echo "" 
        
           echo " -> Running functional tests" 
        
           cd "$XPACK_DIR" 
        
           xvfb-run node scripts/functional_tests --bail --kibana-install-dir "$installDir" --es-from=source

This PR integrates that with the new setup.

Also addresses and fixes #19181, making sure to run node scripts/functional_tests_server with the --dev flag, to watch for code changes and restart Kibana.

elasticmachine · 2018-05-16T15:45:24Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

elasticmachine · 2018-05-16T19:17:24Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request

elasticmachine · 2018-05-16T21:21:07Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

elasticmachine · 2018-05-16T22:51:34Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request

rhoboat · 2018-05-16T23:32:01Z

Huzzah! Looks like it's working.

rhoboat · 2018-05-17T19:52:42Z

test/common/config.js

+        `--elasticsearch.username=${servers.elasticsearch.username}`,
+        `--elasticsearch.password=${servers.elasticsearch.password}`,
+      ],
+    },


Just had to reogranize what's provided by common config.

rhoboat · 2018-05-17T19:53:50Z

packages/kbn-test/src/functional_tests/lib/run_kibana_server.js

+  return installDir
+    ? [...serverArgs, ...buildArgs]
+    : [KIBANA_EXEC_PATH, ...serverArgs, ...sourceArgs];
+}


Here's where we collect the right CLI args based on whether installDir was passed (based --kibana-install-dir)

spalger

LGTM, thanks!

elasticmachine · 2018-05-17T22:10:44Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request

rhoboat · 2018-05-17T22:20:56Z

jenkins test this

elasticmachine · 2018-05-17T23:22:54Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request

rhoboat · 2018-05-18T00:54:41Z

Much better!

This reverts commit 5969860.

* Revert "[DOCS] Removes redundant index.asciidoc files (#19192)" This reverts commit d11b5aa. * Revert "[typescript] add typescript support for the server and browser (#19104)" This reverts commit c611206. * Revert "Option to run kibana from build for CI (#19125)" This reverts commit 5969860.

* Option to run kibana from build for CI (#19125) * Support --dev option for servers only * try skipping dashboard time zones test

rhoboat self-assigned this May 16, 2018

rhoboat requested review from tylersmalley and spalger May 16, 2018 14:30

rhoboat commented May 17, 2018

View reviewed changes

spalger approved these changes May 17, 2018

View reviewed changes

kimjoar mentioned this pull request May 17, 2018

Integration tests for new platform #12699

Closed

13 tasks

Option to run kibana from build for CI

0199812

rhoboat added Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc backport pending dev review labels May 18, 2018

rhoboat merged commit 5969860 into elastic:master May 18, 2018

rhoboat deleted the xpack-ci-build-kibana branch May 18, 2018 17:45

rhoboat pushed a commit that referenced this pull request May 18, 2018

Option to run kibana from build for CI (#19125)

2a2ccd1

rhoboat pushed a commit that referenced this pull request May 18, 2018

Option to run kibana from build for CI (#19125)

5510787

rhoboat pushed a commit that referenced this pull request May 18, 2018

Revert "Option to run kibana from build for CI (#19125)"

e3a6648

This reverts commit 5969860.

rhoboat mentioned this pull request May 18, 2018

Revert "Option to run kibana from build for CI" #19224

Merged

epixa added the reverted label May 18, 2018

rhoboat pushed a commit that referenced this pull request May 21, 2018

Option to run kibana from build for CI (#19125) (#19225)

f63a3df

* Option to run kibana from build for CI (#19125) * Support --dev option for servers only * try skipping dashboard time zones test

This was referenced May 21, 2018

[6.x] Option to run kibana from build on CI (#19125) #19256

Merged

[6.3] Option to run kibana from build on CI (#19125) (#19225) #19257

Merged

rhoboat pushed a commit that referenced this pull request May 22, 2018

Option to run kibana from build for CI (#19125) (#19225) (#19256)

5316542

* Option to run kibana from build for CI (#19125) * Support --dev option for servers only * try skipping dashboard time zones test

rhoboat pushed a commit that referenced this pull request May 22, 2018

[6.3] Option to run kibana from build for CI (#19125) (#19225) (#19257)

cb0cdc7

* Option to run kibana from build for CI (#19125) * Support --dev option for servers only * try skipping dashboard time zones test

epixa removed the backport pending label May 22, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Option to run kibana from build for CI #19125

Option to run kibana from build for CI #19125

rhoboat commented May 16, 2018 •

edited

Loading

elasticmachine commented May 16, 2018

elasticmachine commented May 16, 2018

elasticmachine commented May 16, 2018

elasticmachine commented May 16, 2018

rhoboat commented May 16, 2018

rhoboat May 17, 2018

rhoboat May 17, 2018

spalger left a comment

elasticmachine commented May 17, 2018

rhoboat commented May 17, 2018

elasticmachine commented May 17, 2018

rhoboat commented May 18, 2018

	const runFromSourceArgs = existingInstallDir
	? ['--optimize.useBundleCache=true']
	: [
	KIBANA_SCRIPT_PATH,
	'--no-base-path',
	`--optimize.bundleDir=${OPTIMIZE_BUNDLE_DIR}`,
	];

	.option(
	'--kibana-install-dir <path>',
	'Run Kibana from an existing install directory'
	)

	echo " -> building and extracting default Kibana distributable for use in functional tests"
	cd "$KIBANA_DIR"
	node scripts/build --debug --no-oss
	linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
	installDir="$PARENT_DIR/install/kibana"
	mkdir -p "$installDir"
	tar -xzf "$linuxBuild" -C "$installDir" --strip=1


	echo " -> Running api integration tests"
	cd "$XPACK_DIR"
	node scripts/functional_tests_api --kibana-install-dir "$installDir" --es-from=source
	echo ""
	echo ""


	echo " -> Running functional tests"
	cd "$XPACK_DIR"
	xvfb-run node scripts/functional_tests --bail --kibana-install-dir "$installDir" --es-from=source

Option to run kibana from build for CI #19125

Option to run kibana from build for CI #19125

Conversation

rhoboat commented May 16, 2018 • edited Loading

elasticmachine commented May 16, 2018

💔 Build Failed

elasticmachine commented May 16, 2018

💚 Build Succeeded

elasticmachine commented May 16, 2018

💔 Build Failed

elasticmachine commented May 16, 2018

💚 Build Succeeded

rhoboat commented May 16, 2018

rhoboat May 17, 2018

Choose a reason for hiding this comment

rhoboat May 17, 2018

Choose a reason for hiding this comment

spalger left a comment

Choose a reason for hiding this comment

elasticmachine commented May 17, 2018

💚 Build Succeeded

rhoboat commented May 17, 2018

elasticmachine commented May 17, 2018

💚 Build Succeeded

rhoboat commented May 18, 2018

rhoboat commented May 16, 2018 •

edited

Loading