From 17c59d34297c324e72dfae7cc19e9057f329e38d Mon Sep 17 00:00:00 2001 From: Kirill Sibirev Date: Wed, 24 Apr 2024 09:05:42 +0200 Subject: [PATCH] Update labels for better test balance --- .../{pr_test_e2e_update.yaml => pr_test_e2e_basic.yaml} | 6 +++--- .../{pr_test_e2e_other.yaml => pr_test_e2e_extra.yaml} | 6 +++--- test/e2e/ytsaurus_controller_test.go | 9 +++------ 3 files changed, 9 insertions(+), 12 deletions(-) rename .github/workflows/{pr_test_e2e_update.yaml => pr_test_e2e_basic.yaml} (52%) rename .github/workflows/{pr_test_e2e_other.yaml => pr_test_e2e_extra.yaml} (51%) diff --git a/.github/workflows/pr_test_e2e_update.yaml b/.github/workflows/pr_test_e2e_basic.yaml similarity index 52% rename from .github/workflows/pr_test_e2e_update.yaml rename to .github/workflows/pr_test_e2e_basic.yaml index 43017033..758bb41e 100644 --- a/.github/workflows/pr_test_e2e_update.yaml +++ b/.github/workflows/pr_test_e2e_basic.yaml @@ -1,11 +1,11 @@ -name: Run e2e tests +name: Run basic e2e tests on: pull_request: jobs: check: - name: Run e2e tests for update scenarios + name: Run e2e tests for basic scenarios uses: ./.github/workflows/subflow_run_e2e_tests.yaml with: - e2e_filter: "update" + e2e_filter: "basic" diff --git a/.github/workflows/pr_test_e2e_other.yaml b/.github/workflows/pr_test_e2e_extra.yaml similarity index 51% rename from .github/workflows/pr_test_e2e_other.yaml rename to .github/workflows/pr_test_e2e_extra.yaml index 084bde34..c9fb98e2 100644 --- a/.github/workflows/pr_test_e2e_other.yaml +++ b/.github/workflows/pr_test_e2e_extra.yaml @@ -1,11 +1,11 @@ -name: Run e2e tests +name: Run extra e2e tests on: pull_request: jobs: check: - name: Run e2e tests for non-update scenarios + name: Run e2e tests for extra scenarios uses: ./.github/workflows/subflow_run_e2e_tests.yaml with: - e2e_filter: "!update" + e2e_filter: "!basic" diff --git a/test/e2e/ytsaurus_controller_test.go b/test/e2e/ytsaurus_controller_test.go index 4c935aec..fa089c4c 100644 --- a/test/e2e/ytsaurus_controller_test.go +++ b/test/e2e/ytsaurus_controller_test.go @@ -253,13 +253,10 @@ type testRow struct { var _ = Describe("Basic test for Ytsaurus controller", func() { Context("When setting up the test environment", func() { It( - "Should run and update Ytsaurus within same major version", - Label("update"), - getSimpleUpdateScenario("test-minor-update", ytv1.CoreImageSecond), + "Should run and update Ytsaurus within same major version", Label("basic"), getSimpleUpdateScenario("test-minor-update", ytv1.CoreImageSecond), ) It( "Should run and update Ytsaurus to the next major version", - Label("update"), getSimpleUpdateScenario("test-major-update", ytv1.CoreImageNextVer), ) It( @@ -356,7 +353,7 @@ var _ = Describe("Basic test for Ytsaurus controller", func() { }, ) It( - "Should be updated according to UpdateSelector=MasterOnly,StatelessOnly", func(ctx context.Context) { + "Should be updated according to UpdateSelector=MasterOnly,StatelessOnly", Label("basic"), func(ctx context.Context) { namespace := "testslctother" By("Creating a Ytsaurus resource") @@ -564,7 +561,7 @@ var _ = Describe("Basic test for Ytsaurus controller", func() { runImpossibleUpdateAndRollback(ytsaurus, ytClient) }) - It("Should run with query tracker and check that access control objects set up correctly", func(ctx context.Context) { + It("Should run with query tracker and check that access control objects set up correctly", Label("basic"), func(ctx context.Context) { By("Creating a Ytsaurus resource") namespace := "querytrackeraco"