diff --git a/.packit.yaml b/.packit.yaml index 939148e..d8b1a4f 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,48 @@ 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-all" + targets: + - centos-stream-9-x86_64 + skip_build: true + manual_trigger: true + env: { IP_FAMILY: ipv4 } + labels: + - flink-all + tf_extra_params: + test: + tmt: + name: flink-all + ############################################################################################### + - 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 - identifier: "verify-main" + identifier: "smoke" targets: - centos-stream-9-x86_64 skip_build: true @@ -56,4 +88,4 @@ jobs: tf_extra_params: test: tmt: - name: verify + name: smoke diff --git a/README.md b/README.md index 79f8fb2..cf027fe 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 @@ -49,11 +49,18 @@ $ ./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. 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-all + +# run smoke tests +/packit test --labels smoke ``` 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..234cae1 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-all: + summary: Run all flink related tests + discover+: + test: + - flink-all diff --git a/tmt/tests/streams-e2e/main.fmf b/tmt/tests/streams-e2e/main.fmf index 515b973..9baa111 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-all: + summary: Run flink streams-e2e suite + duration: 180m + tier: 1 + environment+: + TEST_GROUPS: flink