Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Osquery] Unskip add_integration.cy.ts #180733

Merged
merged 6 commits into from
Apr 15, 2024
Merged

[Osquery] Unskip add_integration.cy.ts #180733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e38b20d
test
tomsonpl Apr 12, 2024
084b628
fix
tomsonpl Apr 12, 2024
b673036
fix
tomsonpl Apr 15, 2024
a20d1f8
Merge branch 'main' into flaky-integration
tomsonpl Apr 15, 2024
475afd7
unskip
tomsonpl Apr 15, 2024
0285b52
Merge branch 'main' into flaky-integration
tomsonpl Apr 15, 2024
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
14 changes: 4 additions & 10 deletions x-pack/plugins/osquery/cypress/e2e/all/add_integration.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,7 @@ import {
} from '../../tasks/integrations';
import { ServerlessRoleName } from '../../support/roles';

// Failing: See https://github.com/elastic/kibana/issues/170445
// Failing: See https://github.com/elastic/kibana/issues/169701
// Failing: See https://github.com/elastic/kibana/issues/170593
describe.skip('ALL - Add Integration', { tags: ['@ess', '@serverless'] }, () => {
describe('ALL - Add Integration', { tags: ['@ess', '@serverless'] }, () => {
let savedQueryId: string;

before(() => {
Expand Down Expand Up @@ -77,8 +74,7 @@ describe.skip('ALL - Add Integration', { tags: ['@ess', '@serverless'] }, () =>
}
);

// FLAKY: https://github.com/elastic/kibana/issues/169701
describe.skip('Add and upgrade integration', { tags: ['@ess', '@serverless'] }, () => {
describe('Add and upgrade integration', { tags: ['@ess', '@serverless'] }, () => {
const oldVersion = '0.7.4';
const [integrationName, policyName] = generateRandomStringName(2);
let policyId: string;
Expand Down Expand Up @@ -107,8 +103,7 @@ describe.skip('ALL - Add Integration', { tags: ['@ess', '@serverless'] }, () =>
cy.contains(`version: ${oldVersion}`).should('not.exist');
});
});
// FLAKY: https://github.com/elastic/kibana/issues/170593
describe.skip('Add integration to policy', () => {
describe('Add integration to policy', () => {
const [integrationName, policyName] = generateRandomStringName(2);
let policyId: string;
beforeEach(() => {
Expand Down Expand Up @@ -148,8 +143,7 @@ describe.skip('ALL - Add Integration', { tags: ['@ess', '@serverless'] }, () =>
});
});

// FLAKY: https://github.com/elastic/kibana/issues/170445
describe.skip('Upgrade policy with existing packs', () => {
describe('Upgrade policy with existing packs', () => {
const oldVersion = '1.2.0';
const [policyName, integrationName, packName] = generateRandomStringName(3);
let policyId: string;
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/osquery/cypress/tasks/integrations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ export const installPackageWithVersion = (integration: string, version: string)
};

const extractSemanticVersion = (str: string) => {
const match = str.match(/(\d+\.\d+\.\d+)/);
const match = str.match(/(Managerv\d+\.\d+\.\d+)/);
if (match && match[1]) {
return match[1];
return match[1].replace('Managerv', '');
} else {
return null; // Return null if no match found
}
Expand Down