habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix integration test runner for 8.8 (#1859)

Browse Source
This commit is contained in:
Josh Mock
2023-05-02 09:57:03 -05:00
committed by GitHub
parent 19d2ee324f
commit 4011f0153f
1 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
test/integration/test-runner.js
View File

@ -85,7 +85,11 @@ function build (opts = {}) {
) )
// remove 'x_pack_rest_user', used in some xpack test // remove 'x_pack_rest_user', used in some xpack test
await client.security.deleteUser({ username: 'x_pack_rest_user' }, { ignore: [404] }) try {
await client.security.deleteUser({ username: 'x_pack_rest_user' }, { ignore: [404] })
} catch {
// do nothing
}
const searchableSnapshotIndices = await client.cluster.state({ const searchableSnapshotIndices = await client.cluster.state({
metric: 'metadata', metric: 'metadata',
@ -137,7 +141,11 @@ function build (opts = {}) {
const body = await client.cluster.getComponentTemplate() const body = await client.cluster.getComponentTemplate()
const components = body.component_templates.filter(c => !isXPackTemplate(c.name)).map(c => c.name) const components = body.component_templates.filter(c => !isXPackTemplate(c.name)).map(c => c.name)
if (components.length > 0) { if (components.length > 0) {
await client.cluster.deleteComponentTemplate({ name: components.join(',') }, { ignore: [404] }) try {
await client.cluster.deleteComponentTemplate({ name: components.join(',') }, { ignore: [404] })
} catch {
// do nothing
}
} }
// Remove any cluster setting // Remove any cluster setting
@ -157,9 +165,25 @@ function build (opts = {}) {
if (isXPack) { if (isXPack) {
// delete ilm policies // delete ilm policies
const preserveIlmPolicies = [ const preserveIlmPolicies = [
'ilm-history-ilm-policy', 'slm-history-ilm-policy', "ilm-history-ilm-policy",
'watch-history-ilm-policy', 'ml-size-based-ilm-policy', "slm-history-ilm-policy",
'logs', 'metrics' "watch-history-ilm-policy",
"watch-history-ilm-policy-16",
"ml-size-based-ilm-policy",
"logs",
"metrics",
"synthetics",
"7-days-default",
"30-days-default",
"90-days-default",
"180-days-default",
"365-days-default",
".fleet-actions-results-ilm-policy",
".fleet-file-data-ilm-policy",
".fleet-files-ilm-policy",
".deprecation-indexing-ilm-policy",
".monitoring-8-ilm-policy",
"behavioral_analytics-events-default_policy",
] ]
const policies = await client.ilm.getLifecycle() const policies = await client.ilm.getLifecycle()
for (const policy in policies) { for (const policy in policies) {
@ -257,7 +281,7 @@ function build (opts = {}) {
* - cleanup * - cleanup
* @param {object} setup (null if not needed) * @param {object} setup (null if not needed)
* @param {object} test * @param {object} test
* @oaram {object} teardown (null if not needed) * @param {object} teardown (null if not needed)
* @returns {Promise} * @returns {Promise}
*/ */
async function run (setup, test, teardown, stats, junit) { async function run (setup, test, teardown, stats, junit) {