From 34e8c735b31a2f4dacf6316a0838adc9787f8a9a Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 13:45:37 -0700 Subject: [PATCH] [CI] Split build and verify into parallel jobs (#4467) (#4548) * Also made linter and NOTICE validation run only on Linux Signed-off-by: Miki (cherry picked from commit 24bde32c0751367cc56bf1a727c487c0edc90ada) Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] --- .github/workflows/build_and_test_workflow.yml | 38 +++---- TESTING.md | 2 + src/dev/jest/config.js | 105 ++++++++++++++++-- 3 files changed, 114 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build_and_test_workflow.yml b/.github/workflows/build_and_test_workflow.yml index 912449267633..f4f5395ea2fd 100644 --- a/.github/workflows/build_and_test_workflow.yml +++ b/.github/workflows/build_and_test_workflow.yml @@ -29,11 +29,12 @@ env: jobs: build-lint-test: - name: Build and Verify on ${{ matrix.name }} + name: Build and Verify on ${{ matrix.name }} (ciGroup${{ matrix.group }}) strategy: fail-fast: false matrix: os: [ubuntu-latest, windows-latest] + group: [1, 2, 3, 4] include: - os: ubuntu-latest name: Linux @@ -72,14 +73,9 @@ jobs: if: matrix.os != 'windows-latest' run: echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $GITHUB_ENV - - name: Configure Yarn Cache (Windows) - if: matrix.os == 'windows-latest' - run: | - echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $env:GITHUB_ENV - echo C:\Program Files\Git\usr\bin>>"%GITHUB_PATH%" - - name: Initialize Yarn Cache uses: actions/cache@v3 + if: matrix.os != 'windows-latest' with: path: ${{ env.YARN_CACHE_LOCATION }} key: yarn-${{ hashFiles('**/yarn.lock') }} @@ -95,18 +91,24 @@ jobs: run: yarn osd bootstrap || yarn osd bootstrap - name: Run linter + # ciGroup 1 of unit-tests is shorter and Linux is faster + if: matrix.group == 1 && matrix.os == 'ubuntu-latest' id: linter run: yarn lint - name: Validate NOTICE file + # ciGroup 1 of unit-tests is shorter and Linux is faster + if: matrix.group == 1 && matrix.os == 'ubuntu-latest' id: notice-validate run: yarn notice:validate - - name: Run unit tests with coverage + - name: Run unit tests group ${{ matrix.group }} with coverage id: unit-tests - run: yarn test:jest:ci:coverage + run: yarn test:jest:ci:coverage --ci-group=${{ matrix.group }} - name: Run mocha tests with coverage + # ciGroup 1 of unit-tests is shorter + if: matrix.group == 1 id: mocha-tests run: yarn test:mocha:coverage @@ -115,9 +117,11 @@ jobs: uses: codecov/codecov-action@v3 with: directory: ./target/opensearch-dashboards-coverage - flags: ${{ matrix.name }} + flags: ${{ matrix.name }}_${{ matrix.group }} - name: Run integration tests + # ciGroup 1 of unit-tests is shorter + if: matrix.group == 1 id: integration-tests run: yarn test:jest_integration:ci @@ -168,14 +172,9 @@ jobs: if: matrix.os != 'windows-latest' run: echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $GITHUB_ENV - - name: Configure Yarn Cache (Windows) - if: matrix.os == 'windows-latest' - run: | - echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $env:GITHUB_ENV - echo C:\Program Files\Git\usr\bin>>"%GITHUB_PATH%" - - name: Initialize Yarn Cache uses: actions/cache@v3 + if: matrix.os != 'windows-latest' with: path: ${{ env.YARN_CACHE_LOCATION }} key: yarn-${{ hashFiles('**/yarn.lock') }} @@ -265,14 +264,9 @@ jobs: if: matrix.os != 'windows-latest' run: echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $GITHUB_ENV - - name: Configure Yarn Cache (Windows) - if: matrix.os == 'windows-latest' - run: | - echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $env:GITHUB_ENV - echo C:\Program Files\Git\usr\bin>>"%GITHUB_PATH%" - - name: Initialize Yarn Cache uses: actions/cache@v3 + if: matrix.os != 'windows-latest' with: path: ${{ env.YARN_CACHE_LOCATION }} key: yarn-${{ hashFiles('**/yarn.lock') }} diff --git a/TESTING.md b/TESTING.md index 23866aede01c..95dc9495309a 100644 --- a/TESTING.md +++ b/TESTING.md @@ -35,6 +35,8 @@ To run all the unit tests: `yarn test:jest` To run specific unit tests, pass the path to the test: `yarn test:jest [test path]` +To run specific unit test groups: +`yarn test:jest --ci-group=1 --ci-group=2` ### Integration tests To run all the integration tests: diff --git a/src/dev/jest/config.js b/src/dev/jest/config.js index 8140017a3f8d..c9239710b398 100644 --- a/src/dev/jest/config.js +++ b/src/dev/jest/config.js @@ -28,27 +28,113 @@ * under the License. */ +import { readdirSync } from 'fs'; +import path from 'path'; import { RESERVED_DIR_JEST_INTEGRATION_TESTS } from '../constants'; -export default { - rootDir: '../../..', - roots: [ - '/src/plugins', - '/src/legacy/ui', +const rootDir = '../../..'; +/* The rootGroups will go through a transformation to narrow down the CI groups. + * The transformation pattern is not RegExp or glob compatible and only accepts + * a pattern of `/`, like `/[a-d]` or + * `/[^a-z]` to select any sub-path with a name beginning or not beginning with + * any one of the enclosed characters case-insensitively. Each entry can only + * have one pattern and the pattern can only be at the end of the entry. + * + * Example: '/src/plugins/[a-d]' + * All directories under /src/plugins with names starting with a, A, b, + * B, c, C, d, or D will be included. + * + * Example: '/src/plugins/[^a-z]' + * All directories under /src/plugins with names that start with any + * non A to Z character. + */ +const rootGroups = [ + [ + /* CI Group 0 is left empty to make numbering natural */ + ], + [ + // CI Group 1 (roughly 280 files) + '/src/plugins/[v-z]', // plugins v-u + '/src/plugins/[^a-z]', // To cover anything that might not start with `a-z` + ], + [ + // CI Group 2 (roughly 450 files) '/src/core', - '/src/legacy/server', + '/packages/osd-test/target/functional_test_runner', + '/packages', + ], + [ + // CI Group 3 (roughly 400 files) + '/src/plugins/[a-d]', // plugins a-d + ], + [ + // CI Group 4 (roughly 410 files) '/src/cli', '/src/cli_keystore', '/src/cli_plugin', - '/packages/osd-test/target/functional_test_runner', '/src/dev', - '/src/optimize', + '/src/plugins/[e-u]', // plugins e-u + '/src/legacy/server', + '/src/legacy/ui', '/src/legacy/utils', + '/src/optimize', '/src/setup_node_env', - '/packages', '/src/test_utils', '/test/functional/services/remote', ], +]; + +const roots = []; +const cachedRoots = {}; +const rootPattern = /^(.+)\/(\[.+])$/; // Anything that ends with /[] +const addRoots = (items) => { + // Lazy way of making sure we have a flat array, even if dealing with a single string + [items].flat(Infinity).forEach((item) => { + const match = item.match(rootPattern); + if (match?.[2]) { + // Check if the content of the folder we previously fetched; if not, do so now + if (!Array.isArray(cachedRoots[match[1]])) { + const itemRealPath = path.join(__dirname, match[1].replace('', rootDir)); + cachedRoots[match[1]] = readdirSync(itemRealPath, { withFileTypes: true }) + .filter((entry) => entry.isDirectory()) + .map((entry) => entry.name); + } + + // Convert the pattern portion of the item into regex + const rePattern = new RegExp(`^${match[2]}`, 'i'); + roots.push( + ...cachedRoots[match[1]] + .filter((name) => rePattern.test(name)) + .map((name) => `${match[1]}/${name}`) + ); + } else { + // item doesn't end with a pattern; just add it to roots + roots.push(item); + } + }); +}; + +// Looks for --ci-group= and captures the number +const ciGroupPattern = /^--ci-group=(\d+)$/; +const ciGroups = process.argv.reduce((acc, arg) => { + const match = arg.match(ciGroupPattern); + if (isFinite(match?.[1])) acc.push(parseInt(match[1], 10)); + return acc; +}, []); + +console.log('ciGroups', ciGroups); +if (ciGroups.length > 0) { + console.log(`Requested group${ciGroups.length === 1 ? '' : 's'}: ${ciGroups.join(', ')}`); + ciGroups.forEach((id) => { + if (Array.isArray(rootGroups[id])) addRoots(rootGroups[id]); + }); +} else { + addRoots(rootGroups); +} + +export default { + rootDir, + roots, moduleNameMapper: { '@elastic/eui$': '/node_modules/@elastic/eui/test-env', '@elastic/eui/lib/(.*)?': '/node_modules/@elastic/eui/test-env/$1', @@ -112,4 +198,5 @@ export default { Uint8Array: Uint8Array, }, flakyTestRetries: 2, + verbose: true, };