Skip to content

Commit

Permalink
Fix ginkgo filter tests in GHA (#415)
Browse files Browse the repository at this point in the history
  • Loading branch information
l0kix2 authored Jan 9, 2025
1 parent 48e2c33 commit 40ddc1b
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ jobs:
name: Run e2e tests for extra scenarios
uses: ./.github/workflows/subflow_run_e2e_tests.yaml
with:
e2e_filter: "!basic"
e2e_filter: "!basic && !selector"
11 changes: 11 additions & 0 deletions .github/workflows/pr_test_e2e_selector.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Run selector e2e tests

on:
pull_request:

jobs:
check:
name: Run e2e tests for update selector scenarios
uses: ./.github/workflows/subflow_run_e2e_tests.yaml
with:
e2e_filter: "selector"
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ DEBUG =
## Tests parallelism.
GINKGO_PROCS ?= 2

## Filter tests by labels.
GINKGO_LABEL_FILTER =

GINKGO_FLAGS += --vv
GINKGO_FLAGS += --trace
GINKGO_FLAGS += --procs="$(GINKGO_PROCS)"
Expand Down
10 changes: 5 additions & 5 deletions test/e2e/ytsaurus_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ var _ = Describe("Basic e2e test for Ytsaurus controller", Label("e2e"), func()
})
},
Entry("When update Ytsaurus within same major version", Label("basic"), testutil.CoreImageSecond),
Entry("When update Ytsaurus to the next major version", testutil.CoreImageNextVer),
Entry("When update Ytsaurus to the next major version", Label("basic"), testutil.CoreImageNextVer),
)

Context("Test UpdateSelector", Label("selector"), func() {
Expand Down Expand Up @@ -376,7 +376,7 @@ var _ = Describe("Basic e2e test for Ytsaurus controller", Label("e2e"), func()
Expect(pods.Updated).To(ConsistOf("tnd-0", "tnd-1", "tnd-2"), "updated")
})

It("Should be updated according to UpdateSelector=MasterOnly,StatelessOnly", Label("basic"), func(ctx context.Context) {
It("Should be updated according to UpdateSelector=MasterOnly,StatelessOnly", func(ctx context.Context) {

By("Run cluster update with selector:MasterOnly")
ytsaurus.Spec.UpdateSelector = ytv1.UpdateSelectorMasterOnly
Expand Down Expand Up @@ -592,7 +592,7 @@ var _ = Describe("Basic e2e test for Ytsaurus controller", Label("e2e"), func()
ytsaurus = testutil.WithQueryTracker(ytsaurus)
})

It("Should run with query tracker and check that query tracker rpc address set up correctly", Label("basic"), func(ctx context.Context) {
It("Should run with query tracker and check that query tracker rpc address set up correctly", func(ctx context.Context) {
By("Check that query tracker channel exists in cluster_connection")
Expect(ytClient.NodeExists(ctx, ypath.Path("//sys/@cluster_connection/query_tracker/stages/production/channel"), nil)).Should(BeTrue())
})
Expand All @@ -605,7 +605,7 @@ var _ = Describe("Basic e2e test for Ytsaurus controller", Label("e2e"), func()
ytsaurus = testutil.WithYqlAgent(ytsaurus)
})

It("Should run with yql agent and check that yql agent channel options set up correctly", Label("basic"), func(ctx context.Context) {
It("Should run with yql agent and check that yql agent channel options set up correctly", func(ctx context.Context) {
By("Creating ytsaurus client")
ytClient := createYtsaurusClient(ytsaurus, namespace)

Expand All @@ -624,7 +624,7 @@ var _ = Describe("Basic e2e test for Ytsaurus controller", Label("e2e"), func()
ytsaurus = testutil.WithQueueAgent(ytsaurus)
})

It("Should run with query tracker and check that access control objects set up correctly", Label("basic"), func(ctx context.Context) {
It("Should run with query tracker and check that access control objects set up correctly", func(ctx context.Context) {

By("Check that access control object namespace 'queries' exists")
Expect(ytClient.NodeExists(ctx, ypath.Path("//sys/access_control_object_namespaces/queries"), nil)).Should(BeTrue())
Expand Down

0 comments on commit 40ddc1b

Please sign in to comment.