From c7acd53a2e93989c2ce7ea9609d439114a7a8616 Mon Sep 17 00:00:00 2001 From: David Kornel Date: Mon, 16 Sep 2024 17:01:21 +0200 Subject: [PATCH 1/5] Packit: add more test groups + define smoke Signed-off-by: David Kornel --- .packit.yaml | 25 ++++++++++++++++--- README.md | 8 ++++-- .../java/io/streams/constants/TestTags.java | 4 +-- .../streams/e2e/flink/sql/SqlExampleST.java | 4 +-- .../streams/e2e/flink/sql/SqlJobRunnerST.java | 6 +++-- tmt/plans/main.fmf | 18 ++++++++++--- tmt/tests/streams-e2e/main.fmf | 18 +++++++++++-- 7 files changed, 66 insertions(+), 17 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 939148e..94f82b2 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -28,7 +28,7 @@ jobs: - job: tests trigger: pull_request # Suffix for job name - identifier: "sql-example" + identifier: "flink-sql-example" targets: # This target is not used at all by our tests, but it has to be one of the available - https://packit.dev/docs/configuration/#aliases - centos-stream-9-x86_64 @@ -39,16 +39,33 @@ jobs: manual_trigger: true env: { IP_FAMILY: ipv4 } labels: + - flink-sql-example - sql-example tf_extra_params: test: tmt: - name: sql-example + name: flink-sql-example + ############################################################################################### + - job: tests + trigger: pull_request + # Suffix for job name + identifier: "flink" + targets: + - centos-stream-9-x86_64 + skip_build: true + manual_trigger: true + env: { IP_FAMILY: ipv4 } + labels: + - flink + tf_extra_params: + test: + tmt: + name: flink ############################################################################################### - job: tests trigger: commit branch: main - identifier: "verify-main" + identifier: "smoke" targets: - centos-stream-9-x86_64 skip_build: true @@ -56,4 +73,4 @@ jobs: tf_extra_params: test: tmt: - name: verify + name: smoke diff --git a/README.md b/README.md index 79f8fb2..c887412 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ $ ./mvnw verify -P test Run specific tag. ```bash -$ ./mvnw verify -P test -Dgroups=sql-example +$ ./mvnw verify -P test -Dgroups=flink-sql-example ``` Run specific test class or test @@ -55,5 +55,9 @@ TODO If PR is opened, you can use packit for run you tests on top of kind cluster. To run Packit CI, just make comment with following text... ``` -/packit test --labels sql-example +# run sql example test +/packit test --labels flink-sql-example + +# run all flink tests +/packit test --labels flink ``` diff --git a/src/main/java/io/streams/constants/TestTags.java b/src/main/java/io/streams/constants/TestTags.java index 0628415..8d0a83d 100644 --- a/src/main/java/io/streams/constants/TestTags.java +++ b/src/main/java/io/streams/constants/TestTags.java @@ -6,8 +6,8 @@ public interface TestTags { String SMOKE = "smoke"; - String SQL_EXAMPLE = "sql-example"; - String SQL_RUNNER = "sql-runner"; + String FLINK_SQL_EXAMPLE = "flink-sql-example"; + String FLINK_SQL_RUNNER = "flink-sql-runner"; String FLINK = "flink"; String DUMMY = "dummy"; } diff --git a/src/test/java/io/streams/e2e/flink/sql/SqlExampleST.java b/src/test/java/io/streams/e2e/flink/sql/SqlExampleST.java index 34d82d3..d8185a1 100644 --- a/src/test/java/io/streams/e2e/flink/sql/SqlExampleST.java +++ b/src/test/java/io/streams/e2e/flink/sql/SqlExampleST.java @@ -40,11 +40,11 @@ import java.util.concurrent.CompletableFuture; import static io.streams.constants.TestTags.FLINK; -import static io.streams.constants.TestTags.SQL_EXAMPLE; +import static io.streams.constants.TestTags.FLINK_SQL_EXAMPLE; import static org.junit.jupiter.api.Assertions.assertTrue; @Tag(FLINK) -@Tag(SQL_EXAMPLE) +@Tag(FLINK_SQL_EXAMPLE) public class SqlExampleST extends Abstract { String namespace = "flink"; diff --git a/src/test/java/io/streams/e2e/flink/sql/SqlJobRunnerST.java b/src/test/java/io/streams/e2e/flink/sql/SqlJobRunnerST.java index c48eb29..6c2c5a0 100644 --- a/src/test/java/io/streams/e2e/flink/sql/SqlJobRunnerST.java +++ b/src/test/java/io/streams/e2e/flink/sql/SqlJobRunnerST.java @@ -38,12 +38,13 @@ import java.util.concurrent.CompletableFuture; import static io.streams.constants.TestTags.FLINK; -import static io.streams.constants.TestTags.SQL_RUNNER; +import static io.streams.constants.TestTags.FLINK_SQL_RUNNER; +import static io.streams.constants.TestTags.SMOKE; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @Tag(FLINK) -@Tag(SQL_RUNNER) +@Tag(FLINK_SQL_RUNNER) public class SqlJobRunnerST extends Abstract { String namespace = "flink-filter"; @@ -60,6 +61,7 @@ void prepareOperators() throws IOException { } @Test + @Tag(SMOKE) void testFlinkSqlRunnerSimpleFilter() { // Create namespace KubeResourceManager.getInstance().createOrUpdateResourceWithWait( diff --git a/tmt/plans/main.fmf b/tmt/plans/main.fmf index 1040dc1..348340d 100644 --- a/tmt/plans/main.fmf +++ b/tmt/plans/main.fmf @@ -119,8 +119,20 @@ finish: test: - verify -/sql-example: - summary: Run SQL example tests +/smoke: + summary: Run smoke tests discover+: test: - - sql-example + - smoke + +/flink-sql-example: + summary: Run Flink SQL example tests + discover+: + test: + - flink-sql-example + +/flink: + summary: Run all flink related tests + discover+: + test: + - flink diff --git a/tmt/tests/streams-e2e/main.fmf b/tmt/tests/streams-e2e/main.fmf index 515b973..bde17a8 100644 --- a/tmt/tests/streams-e2e/main.fmf +++ b/tmt/tests/streams-e2e/main.fmf @@ -11,9 +11,23 @@ environment: environment+: TEST_GROUPS: dummy -/sql-example: +/smoke: + summary: Run smoke tests + duration: 60m + tier: 1 + environment+: + TEST_GROUPS: smoke + +/flink-sql-example: summary: Run flink sql example streams-e2e suite duration: 60m tier: 1 environment+: - TEST_GROUPS: sql-example + TEST_GROUPS: flink-sql-example + +/flink: + summary: Run flink streams-e2e suite + duration: 180m + tier: 1 + environment+: + TEST_GROUPS: flink From 9bde8fe3ebb755e949b84bd59b06e2578e9fbb4a Mon Sep 17 00:00:00 2001 From: David Kornel Date: Mon, 16 Sep 2024 17:29:49 +0200 Subject: [PATCH 2/5] experiment Signed-off-by: David Kornel --- .packit.yaml | 19 +++++++++++++++++-- tmt/plans/main.fmf | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 94f82b2..209b1cb 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -39,12 +39,11 @@ jobs: manual_trigger: true env: { IP_FAMILY: ipv4 } labels: - - flink-sql-example - sql-example tf_extra_params: test: tmt: - name: flink-sql-example + name: sql-example ############################################################################################### - job: tests trigger: pull_request @@ -62,6 +61,22 @@ jobs: tmt: name: flink ############################################################################################### + - job: tests + trigger: pull_request + # Suffix for job name + identifier: "smoke" + targets: + - centos-stream-9-x86_64 + skip_build: true + manual_trigger: true + env: { IP_FAMILY: ipv4 } + labels: + - smoke + tf_extra_params: + test: + tmt: + name: smoke + ############################################################################################### - job: tests trigger: commit branch: main diff --git a/tmt/plans/main.fmf b/tmt/plans/main.fmf index 348340d..5cbe407 100644 --- a/tmt/plans/main.fmf +++ b/tmt/plans/main.fmf @@ -125,7 +125,7 @@ finish: test: - smoke -/flink-sql-example: +/sql-example: summary: Run Flink SQL example tests discover+: test: From 9346ea6e3399016fe33b1cf7b5b4180b8c284f68 Mon Sep 17 00:00:00 2001 From: David Kornel Date: Tue, 17 Sep 2024 08:05:41 +0200 Subject: [PATCH 3/5] Rename profiles Signed-off-by: David Kornel --- .packit.yaml | 8 ++++---- tmt/plans/main.fmf | 6 +++--- tmt/tests/streams-e2e/main.fmf | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 209b1cb..fa00258 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -39,23 +39,23 @@ jobs: manual_trigger: true env: { IP_FAMILY: ipv4 } labels: - - sql-example + - flink-sql-example tf_extra_params: test: tmt: - name: sql-example + name: flink-sql-example ############################################################################################### - job: tests trigger: pull_request # Suffix for job name - identifier: "flink" + identifier: "flink-all" targets: - centos-stream-9-x86_64 skip_build: true manual_trigger: true env: { IP_FAMILY: ipv4 } labels: - - flink + - flink-all tf_extra_params: test: tmt: diff --git a/tmt/plans/main.fmf b/tmt/plans/main.fmf index 5cbe407..234cae1 100644 --- a/tmt/plans/main.fmf +++ b/tmt/plans/main.fmf @@ -125,14 +125,14 @@ finish: test: - smoke -/sql-example: +/flink-sql-example: summary: Run Flink SQL example tests discover+: test: - flink-sql-example -/flink: +/flink-all: summary: Run all flink related tests discover+: test: - - flink + - flink-all diff --git a/tmt/tests/streams-e2e/main.fmf b/tmt/tests/streams-e2e/main.fmf index bde17a8..9baa111 100644 --- a/tmt/tests/streams-e2e/main.fmf +++ b/tmt/tests/streams-e2e/main.fmf @@ -25,7 +25,7 @@ environment: environment+: TEST_GROUPS: flink-sql-example -/flink: +/flink-all: summary: Run flink streams-e2e suite duration: 180m tier: 1 From c8ec8aecdc6204da8cc945fad10d925413f8a8be Mon Sep 17 00:00:00 2001 From: David Kornel Date: Tue, 17 Sep 2024 08:34:23 +0200 Subject: [PATCH 4/5] Update readme Signed-off-by: David Kornel --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c887412..cf027fe 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ $ ./mvnw verify -P test -Dit.tests=io.streams.e2e.flink.sql.SqlExampleST#testFli ``` ## Test configuration -TODO +- To configure sql runner image set env var `SQL_RUNNER_IMAGE` ## Run Packit CI If PR is opened, you can use packit for run you tests on top of kind cluster. @@ -59,5 +59,8 @@ To run Packit CI, just make comment with following text... /packit test --labels flink-sql-example # run all flink tests -/packit test --labels flink +/packit test --labels flink-all + +# run smoke tests +/packit test --labels smoke ``` From 13e0a361778b8eda082c61e71235948fd348bc7c Mon Sep 17 00:00:00 2001 From: David Kornel Date: Tue, 17 Sep 2024 08:40:27 +0200 Subject: [PATCH 5/5] Rename profile Signed-off-by: David Kornel --- .packit.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.packit.yaml b/.packit.yaml index fa00258..d8b1a4f 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -59,7 +59,7 @@ jobs: tf_extra_params: test: tmt: - name: flink + name: flink-all ############################################################################################### - job: tests trigger: pull_request