From 5feb0f8db838971cddf056aed1b048acaeec3915 Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Mon, 10 Feb 2025 11:34:15 -0800 Subject: [PATCH] Narrowing tier1 on release0.6 branch Signed-off-by: Shveta Sachdeva --- .github/workflows/k8s-ci.yml | 5 +---- cypress.config.ts | 2 +- .../administration/credentials/sourcecontrol_crud.test.ts | 2 +- .../administration/custom-migration-targets/crud.test.ts | 2 +- .../applicationinventory/analysis/source_analysis.test.ts | 8 ++++---- .../analysis/upload_binary_analysis.test.ts | 8 ++++---- .../e2e/tests/migration/task-manager/task_manager.test.ts | 2 +- cypress/e2e/tests/rbac/custom-rules.test.ts | 4 ++-- 8 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.github/workflows/k8s-ci.yml b/.github/workflows/k8s-ci.yml index 7e329bf96..e581720d4 100644 --- a/.github/workflows/k8s-ci.yml +++ b/.github/workflows/k8s-ci.yml @@ -1,9 +1,6 @@ name: Test UI TIER1 , TIER2 , TIER3 -on: - push: - branches: - - main + jobs: k8s-tier1: runs-on: ubuntu-latest diff --git a/cypress.config.ts b/cypress.config.ts index 2dfbb2cba..4a80d16c0 100644 --- a/cypress.config.ts +++ b/cypress.config.ts @@ -49,7 +49,7 @@ export default defineConfig({ defaultCommandTimeout: 8000, e2e: { testIsolation: false, - specPattern: "cypress/e2e/**/*.{js,jsx,ts,tsx}", + specPattern: "cypress/e2e/**/*.test.{js,jsx,ts,tsx}", setupNodeEvents(on, config) { require("./cypress/plugins/index.js")(on, config); on("file:preprocessor", tagify(config)); diff --git a/cypress/e2e/tests/administration/credentials/sourcecontrol_crud.test.ts b/cypress/e2e/tests/administration/credentials/sourcecontrol_crud.test.ts index f178dc724..c1a688cfa 100644 --- a/cypress/e2e/tests/administration/credentials/sourcecontrol_crud.test.ts +++ b/cypress/e2e/tests/administration/credentials/sourcecontrol_crud.test.ts @@ -38,7 +38,7 @@ describe(["@tier2"], "Validation of Source Control Credentials", () => { }); it( - ["@tier1", "@dc", "@interop"], + ["@tier2", "@dc", "@interop"], "Creating source control credentials with username/password and cancelling without saving", () => { scCredsUsername.create(toBeCanceled); diff --git a/cypress/e2e/tests/administration/custom-migration-targets/crud.test.ts b/cypress/e2e/tests/administration/custom-migration-targets/crud.test.ts index e3c31613e..8ff81ba01 100644 --- a/cypress/e2e/tests/administration/custom-migration-targets/crud.test.ts +++ b/cypress/e2e/tests/administration/custom-migration-targets/crud.test.ts @@ -41,7 +41,7 @@ import { import { cancelButton } from "../../../views/common.view"; import { CustomMigrationTargetView } from "../../../views/custom-migration-target.view"; -describe(["@tier1", "@interop"], "Custom Migration Targets CRUD operations", () => { +describe(["@tier2", "@interop"], "Custom Migration Targets CRUD operations", () => { let appFixture: string; let analysisFixture: string; let languageLower: string; diff --git a/cypress/e2e/tests/migration/applicationinventory/analysis/source_analysis.test.ts b/cypress/e2e/tests/migration/applicationinventory/analysis/source_analysis.test.ts index d1b4e81ff..216b67213 100644 --- a/cypress/e2e/tests/migration/applicationinventory/analysis/source_analysis.test.ts +++ b/cypress/e2e/tests/migration/applicationinventory/analysis/source_analysis.test.ts @@ -39,7 +39,7 @@ let source_credential_withHash: CredentialsSourceControlUsername; let maven_credential: CredentialsMaven; let applicationsList: Array = []; -describe(["@tier1"], "Source Analysis", () => { +describe(["@tier2"], "Source Analysis", () => { before("Login", function () { login(); @@ -126,7 +126,7 @@ describe(["@tier1"], "Source Analysis", () => { ); }); - it("Analysis on daytrader app with maven credentials", function () { + it(["@tier1"], "Analysis on daytrader app with maven credentials", function () { // Automate bug https://issues.redhat.com/browse/TACKLE-751 const application = new Analysis( getRandomApplicationData("dayTraderApp_MavenCreds", { @@ -144,7 +144,7 @@ describe(["@tier1"], "Source Analysis", () => { application.verifyAnalysisStatus("Completed"); }); - it("Source Analysis on tackle testapp", function () { + it(["@tier1"], "Source Analysis on tackle testapp", function () { // For tackle test app source credentials are required. const application = new Analysis( getRandomApplicationData("tackleTestApp_Source", { @@ -162,7 +162,7 @@ describe(["@tier1"], "Source Analysis", () => { application.verifyAnalysisStatus("Completed"); }); - it("Analysis on tackle test app with ssh credentials", function () { + it(["@tier1"], "Analysis on tackle test app with ssh credentials", function () { // Automate bug https://issues.redhat.com/browse/TACKLE-707 const scCredsKey = new CredentialsSourceControlKey( data.getRandomCredentialsData( diff --git a/cypress/e2e/tests/migration/applicationinventory/analysis/upload_binary_analysis.test.ts b/cypress/e2e/tests/migration/applicationinventory/analysis/upload_binary_analysis.test.ts index e3d80b70d..65073b627 100644 --- a/cypress/e2e/tests/migration/applicationinventory/analysis/upload_binary_analysis.test.ts +++ b/cypress/e2e/tests/migration/applicationinventory/analysis/upload_binary_analysis.test.ts @@ -26,7 +26,7 @@ import { Application } from "../../../../models/migration/applicationinventory/a import { AnalysisStatuses } from "../../../../types/constants"; const applicationsList: Analysis[] = []; -describe(["@tier1"], "Upload Binary Analysis", () => { +describe(["@tier2"], "Upload Binary Analysis", () => { before("Login", function () { login(); }); @@ -44,7 +44,7 @@ describe(["@tier1"], "Upload Binary Analysis", () => { Application.open(true); }); - it(["@interop"], "Analysis for acmeair app upload binary", function () { + it(["@interop", "@tier1"], "Analysis for acmeair app upload binary", function () { const application = new Analysis( getRandomApplicationData("acmeair_app"), getRandomAnalysisData(this.analysisData["uploadbinary_analysis_on_acmeair"]) @@ -60,7 +60,7 @@ describe(["@tier1"], "Upload Binary Analysis", () => { application.verifyEffort(this.analysisData["uploadbinary_analysis_on_acmeair"]["effort"]); }); - it("Custom rules with custom targets", function () { + it(["@tier1"], "Custom rules with custom targets", function () { // Automated https://issues.redhat.com/browse/TACKLE-561 const application = new Analysis( getRandomApplicationData("customRule_customTarget"), @@ -144,7 +144,7 @@ describe(["@tier1"], "Upload Binary Analysis", () => { ); }); - it(["@tier2"], "upload_binary_with_exculde_packages_scope", function () { + it("upload_binary_with_exculde_packages_scope", function () { const application = new Analysis( getRandomApplicationData("uploadBinary"), getRandomAnalysisData(this.analysisData["upload_binary_with_exculde_packages"]) diff --git a/cypress/e2e/tests/migration/task-manager/task_manager.test.ts b/cypress/e2e/tests/migration/task-manager/task_manager.test.ts index 0efdb036f..011afdb1d 100644 --- a/cypress/e2e/tests/migration/task-manager/task_manager.test.ts +++ b/cypress/e2e/tests/migration/task-manager/task_manager.test.ts @@ -34,7 +34,7 @@ import { TaskManagerColumns, tasksTable } from "../../../views/taskmanager.view" let applicationsList: Array = []; let application: Analysis; -describe(["@tier1"], "Task Manager", () => { +describe(["@tier2"], "Task Manager", () => { before("Login", function () { login(); deleteApplicationTableRows(); diff --git a/cypress/e2e/tests/rbac/custom-rules.test.ts b/cypress/e2e/tests/rbac/custom-rules.test.ts index e0b4a72f0..08c7d6119 100644 --- a/cypress/e2e/tests/rbac/custom-rules.test.ts +++ b/cypress/e2e/tests/rbac/custom-rules.test.ts @@ -31,7 +31,7 @@ import { Analysis } from "../../models/migration/applicationinventory/analysis"; import { AnalysisStatuses, CredentialType, SEC, UserCredentials } from "../../types/constants"; import { RulesRepositoryFields } from "../../types/types"; -describe(["@tier1"], "Custom Rules RBAC operations", function () { +describe(["@tier2"], "Custom Rules RBAC operations", function () { // Polarion TC 318 /** @@ -78,7 +78,7 @@ describe(["@tier1"], "Custom Rules RBAC operations", function () { }); }); - it("Admin, Rules from public repository", function () { + it(["@tier1"], "Admin, Rules from public repository", function () { analysisWithPublicRules = new Analysis( getRandomApplicationData("bookServerApp", { sourceData: this.appData["bookserver-app"],