Skip to content

[No-Jira / WIP] Improve Data Grid operator E2E test cleanup for CI reliability #16157

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

Open
cajieh wants to merge 1 commit into
base: main
Choose a base branch
from
+41 −0
Open

[No-Jira / WIP] Improve Data Grid operator E2E test cleanup for CI reliability #16157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions .../operator-lifecycle-manager/integration-tests-cypress/tests/operator-install-global.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,38 @@ const testOperand: TestOperandProps = {
exampleName: 'example-infinispan',
};

const operatorPackageName = 'datagrid';

const cleanupOperatorResources = () => {
cy.exec(
`oc delete subscription -l operators.coreos.com/${operatorPackageName}.${GlobalInstalledNamespace} -n ${GlobalInstalledNamespace} --ignore-not-found --wait=false`,
{ failOnNonZeroExit: false, timeout: 60000 },
);
cy.exec(
`oc delete csv -l operators.coreos.com/${operatorPackageName}.${GlobalInstalledNamespace} -n ${GlobalInstalledNamespace} --ignore-not-found --wait=false`,
{ failOnNonZeroExit: false, timeout: 60000 },
);
cy.exec(
`oc delete installplan -l operators.coreos.com/${operatorPackageName}.${GlobalInstalledNamespace} -n ${GlobalInstalledNamespace} --ignore-not-found --wait=false`,
{ failOnNonZeroExit: false, timeout: 60000 },
);
};

describe(`Globally installing "${testOperator.name}" operator in ${GlobalInstalledNamespace}`, () => {
before(() => {
cy.login();
cleanupOperatorResources();
operator.install(testOperator.name, testOperator.operatorCardTestID);
});

afterEach(() => {
checkErrors();
});

after(() => {
cleanupOperatorResources();
});

it(`Globally installs ${testOperator.name} operator in ${GlobalInstalledNamespace} and creates ${testOperand.name} operand`, () => {
operator.installedSucceeded(testOperator.name);
operator.navToDetailsPage(testOperator.name);
Expand Down
19 changes: 19 additions & 0 deletions ...lifecycle-manager/integration-tests-cypress/tests/operator-install-single-namespace.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,36 @@ const testOperand: TestOperandProps = {
exampleName: 'example-backup',
};

const operatorPackageName = 'datagrid';

const cleanupOperatorResources = (namespace: string) => {
cy.exec(
`oc delete subscription -l operators.coreos.com/${operatorPackageName}.${namespace} -n ${namespace} --ignore-not-found --wait=false`,
{ failOnNonZeroExit: false, timeout: 60000 },
);
cy.exec(
`oc delete csv -l operators.coreos.com/${operatorPackageName}.${namespace} -n ${namespace} --ignore-not-found --wait=false`,
{ failOnNonZeroExit: false, timeout: 60000 },
);
cy.exec(
`oc delete installplan -l operators.coreos.com/${operatorPackageName}.${namespace} -n ${namespace} --ignore-not-found --wait=false`,
{ failOnNonZeroExit: false, timeout: 60000 },
);
};

describe(`Installing "${testOperator.name}" operator in test namespace`, () => {
before(() => {
cy.login();
cy.createProjectWithCLI(testName);
cleanupOperatorResources(testName);
});

afterEach(() => {
checkErrors();
});

after(() => {
cleanupOperatorResources(testName);
cy.deleteProjectWithCLI(testName);
});

Expand Down