Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/all-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ concurrency:
env:
APPLY_RESOURCE_LIMITS: "auto"
# Newest first: a failure on the newest line is the one to see first in the run UI.
ELK_VERSIONS: "9.5.3 9.4.6 8.19.21 7.17.29"
ELK_VERSIONS: "9.5.4 9.4.7 8.19.21 7.17.29"
ECK_3X: eck-3.5.0
ECK_2X: eck-2.16.1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,15 @@ export class RoAndRoStrictKibanaAccessAssertions {
}

private static changeTenancyAndAwaitSpaces(tenancyName: string) {
if (semver.gte(getKibanaVersion(), '9.4.0')) {
const shouldAwaitSpacesPlugin = semver.gte(getKibanaVersion(), '9.4.0') && semver.lte(getKibanaVersion(), '9.5.3');

if (shouldAwaitSpacesPlugin) {
cy.intercept('*/bundles/plugin/spaces/1.0.0/spaces.chunk*').as('spacesPlugin');
}

RorMenu.changeTenancy(tenancyName);
if (semver.gte(getKibanaVersion(), '9.4.0')) {

if (shouldAwaitSpacesPlugin) {
cy.wait('@spacesPlugin');
}
}
Expand Down
Loading