Skip to content

Commit

Permalink
[build] Migrate grunt ensureAllTestsInCIGroup to script (#85873)
Browse files Browse the repository at this point in the history
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
  • Loading branch information
jbudz and kibanamachine committed Dec 22, 2020
1 parent 5df8292 commit 96fa0db
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .ci/jobs.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file is needed by functionalTests:ensureAllTestsInCiGroup for the list of ciGroups. That must be changed before this file can be removed
# This file is needed by node scripts/ensure_all_tests_in_ci_group for the list of ciGroups. That must be changed before this file can be removed

JOB:
- kibana-intake
Expand Down
21 changes: 21 additions & 0 deletions scripts/ensure_all_tests_in_ci_group.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
* Licensed to Elasticsearch B.V. under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch B.V. licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

require('../src/setup_node_env');
require('../src/dev/run_ensure_all_tests_in_ci_group');
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,28 @@ import { readFileSync } from 'fs';
import { resolve } from 'path';

import execa from 'execa';
import grunt from 'grunt';
import { safeLoad } from 'js-yaml';

const JOBS_YAML = readFileSync(resolve(__dirname, '../.ci/jobs.yml'), 'utf8');
import { run } from '@kbn/dev-utils';

const JOBS_YAML = readFileSync(resolve(__dirname, '../../.ci/jobs.yml'), 'utf8');
const TEST_TAGS = safeLoad(JOBS_YAML)
.JOB.filter((id) => id.startsWith('kibana-ciGroup'))
.map((id) => id.replace(/^kibana-/, ''));

grunt.registerTask(
'functionalTests:ensureAllTestsInCiGroup',
'Check that all of the functional tests are in a CI group',
async function () {
const done = this.async();

try {
const result = await execa(process.execPath, [
'scripts/functional_test_runner',
...TEST_TAGS.map((tag) => `--include-tag=${tag}`),
'--config',
'test/functional/config.js',
'--test-stats',
]);
const stats = JSON.parse(result.stderr);

if (stats.excludedTests.length > 0) {
grunt.fail.fatal(`
run(async ({ log }) => {
try {
const result = await execa(process.execPath, [
'scripts/functional_test_runner',
...TEST_TAGS.map((tag) => `--include-tag=${tag}`),
'--config',
'test/functional/config.js',
'--test-stats',
]);
const stats = JSON.parse(result.stderr);

if (stats.excludedTests.length > 0) {
log.error(`
${stats.excludedTests.length} tests are excluded by the ciGroup tags, make sure that
all test suites have a "ciGroup{X}" tag and that "tasks/functional_test_groups.js"
knows about the tag that you are using.
Expand All @@ -55,12 +51,11 @@ grunt.registerTask(
- ${stats.excludedTests.join('\n - ')}
`);
return;
}

done();
} catch (error) {
grunt.fail.fatal(error.stack);
process.exitCode = 1;
return;
}
} catch (error) {
log.error(error.stack);
process.exitCode = 1;
}
);
});
2 changes: 1 addition & 1 deletion test/scripts/jenkins_build_kibana.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fi
export KBN_NP_PLUGINS_BUILT=true

echo " -> Ensuring all functional tests are in a ciGroup"
yarn run grunt functionalTests:ensureAllTestsInCiGroup;
node scripts/ensure_all_tests_in_ci_group;

echo " -> building and extracting OSS Kibana distributable for use in functional tests"
node scripts/build --debug --oss
Expand Down

0 comments on commit 96fa0db

Please sign in to comment.