diff --git a/cypress.config.ts b/cypress.config.ts index b620788c4..393b097db 100644 --- a/cypress.config.ts +++ b/cypress.config.ts @@ -21,7 +21,7 @@ export default defineConfig({ jira_atlassian_cloud_url: "", jira_atlassian_cloud_project: "Test", jira_stage_datacenter_project_id: 12335626, - tackleUrl: "https://mta-openshift-mta.apps.mig07.rhos-psi.cnv-qe.rhood.us/", + tackleUrl: "/https://tackle-konveyor-tackle.apps.mtv03.rhos-psi.cnv-qe.rhood.us", rwx_enabled: true, logLevel: "ASSERT", mtaVersion: "", @@ -55,12 +55,6 @@ export default defineConfig({ on("file:preprocessor", tagify(config)); require("cypress-fail-fast/plugin")(on, config); require("cypress-fs/plugins")(on, config); - on("task", { - log(args) { - console.log(...args); - return null; - }, - }); return config; }, experimentalMemoryManagement: true, diff --git a/cypress/e2e/tests/upgrade/after_upgrade.test.ts b/cypress/e2e/tests/upgrade/after_upgrade.test.ts index 9eced4adc..4ac67830a 100644 --- a/cypress/e2e/tests/upgrade/after_upgrade.test.ts +++ b/cypress/e2e/tests/upgrade/after_upgrade.test.ts @@ -84,6 +84,8 @@ describe(["@post-upgrade"], "Performing post-upgrade validations", () => { it("Validate Tackle CR", () => validateTackleCr()); + it("Validate MTA Operator Log", () => validateMtaOperatorLog()); + it("Controls - testing existence of instances created before upgrade", function () { const { sourceControlUsernameCredentialsName, @@ -219,6 +221,4 @@ describe(["@post-upgrade"], "Performing post-upgrade validations", () => { isEnabled(clearRepository, rwxEnabled); }); }); - - it.only("Validate MTA Operator Log", () => validateMtaOperatorLog()); }); diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts index 5e83c6925..43122fe4c 100644 --- a/cypress/support/commands.ts +++ b/cypress/support/commands.ts @@ -52,13 +52,3 @@ Cypress.Commands.add( dropElement.realMouseMove(0, 0, { position: "topLeft" }).realMouseUp().wait(200); } ); -Cypress.Commands.overwrite("log", function (log, ...args) { - if (Cypress.browser.isHeadless) { - return cy.task("log", args, { log: false }).then(() => { - return log(...args); - }); - } else { - console.log(...args); - return log(...args); - } -}); diff --git a/cypress/utils/utils.ts b/cypress/utils/utils.ts index aaf0337df..96828ca42 100644 --- a/cypress/utils/utils.ts +++ b/cypress/utils/utils.ts @@ -1860,11 +1860,8 @@ export function validateMtaOperatorLog(): void { cy.wait(30 * SEC); cy.pause(); let command = `oc logs $(oc get pods -n openshift-mta| grep mta-operator | cut -d " " -f 1) -n openshift-mta | grep failed | tail -n 1| awk -F 'failed=' '{print $2}'|cut -d " " -f 1`; - cy.log("COMMAND:", command); getCommandOutput(command).then((result) => { - cy.log("RESULT:", result); const failedCount = parseInt(result.stdout.trim()); - cy.log("FAILED COUNT IS", failedCount); if (Number.isNaN(failedCount)) { throw `Debugging output\n result.stdout: ${result.stdout}EOV\n