From 0f93598cbc46fd2f9e05000d4ff8b7062d99ef61 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 24 May 2023 12:04:26 +0300 Subject: [PATCH 1/3] [improve][ci] Split Elasticsearch tests to separate build job - the tests in Pulsar IO are extremely slow and could cause the current 75 minute limit to exceed. - elastic-search tests are the slowest Pulsar IO tests --- .github/workflows/pulsar-ci.yaml | 2 ++ build/run_unit_group.sh | 6 ++++++ pom.xml | 7 +++++++ pulsar-io/pom.xml | 10 +++++++++- 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pulsar-ci.yaml b/.github/workflows/pulsar-ci.yaml index b92599581cd83..b925f016c3247 100644 --- a/.github/workflows/pulsar-ci.yaml +++ b/.github/workflows/pulsar-ci.yaml @@ -198,6 +198,8 @@ jobs: - name: Pulsar IO group: PULSAR_IO timeout: 75 + - name: Pulsar IO - Elastic Search + group: PULSAR_IO_ELASTIC - name: Pulsar Client group: CLIENT diff --git a/build/run_unit_group.sh b/build/run_unit_group.sh index ba49820ed1d33..4ad0f04a69be5 100755 --- a/build/run_unit_group.sh +++ b/build/run_unit_group.sh @@ -188,6 +188,12 @@ function test_group_pulsar_io() { echo "::endgroup::" } +function test_group_pulsar_io_elastic() { + echo "::group::Running elastic-search tests" + mvn_test --install -Ppulsar-io-elastic-tests,-main + echo "::endgroup::" +} + function list_test_groups() { declare -F | awk '{print $NF}' | sort | grep -E '^test_group_' | sed 's/^test_group_//g' | tr '[:lower:]' '[:upper:]' } diff --git a/pom.xml b/pom.xml index 75c25e5478893..60dd4cfda6e5f 100644 --- a/pom.xml +++ b/pom.xml @@ -2438,6 +2438,13 @@ flexible messaging model and an intuitive client API. + + pulsar-io-elastic-tests + + pulsar-io + + + pulsar-sql-tests diff --git a/pulsar-io/pom.xml b/pulsar-io/pom.xml index 53079cdfbc807..e64c4a46c84df 100644 --- a/pulsar-io/pom.xml +++ b/pulsar-io/pom.xml @@ -97,7 +97,6 @@ hdfs3 jdbc data-generator - elastic-search kafka-connect-adaptor kafka-connect-adaptor-nar debezium @@ -117,6 +116,15 @@ + + pulsar-io-elastic-tests + + core + common + elastic-search + + + core-modules From da2add2696c7cc96e5da80b09f3c0dc8ff989fed Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 24 May 2023 12:22:15 +0300 Subject: [PATCH 2/3] Split Kafka Connect adaptor tests to separate build job --- .github/workflows/pulsar-ci.yaml | 2 ++ build/run_unit_group.sh | 6 ++++++ pom.xml | 7 +++++++ pulsar-io/pom.xml | 16 ++++++++++++---- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pulsar-ci.yaml b/.github/workflows/pulsar-ci.yaml index b925f016c3247..2c4abdb704178 100644 --- a/.github/workflows/pulsar-ci.yaml +++ b/.github/workflows/pulsar-ci.yaml @@ -200,6 +200,8 @@ jobs: timeout: 75 - name: Pulsar IO - Elastic Search group: PULSAR_IO_ELASTIC + - name: Pulsar IO - Kafka Connect Adaptor + group: PULSAR_IO_KAFKA_CONNECT - name: Pulsar Client group: CLIENT diff --git a/build/run_unit_group.sh b/build/run_unit_group.sh index 4ad0f04a69be5..69434b011b37e 100755 --- a/build/run_unit_group.sh +++ b/build/run_unit_group.sh @@ -194,6 +194,12 @@ function test_group_pulsar_io_elastic() { echo "::endgroup::" } +function test_group_pulsar_io_kafka_connect() { + echo "::group::Running Pulsar IO Kafka connect adaptor tests" + mvn_test --install -Ppulsar-io-kafka-connect-tests,-main + echo "::endgroup::" +} + function list_test_groups() { declare -F | awk '{print $NF}' | sort | grep -E '^test_group_' | sed 's/^test_group_//g' | tr '[:lower:]' '[:upper:]' } diff --git a/pom.xml b/pom.xml index 60dd4cfda6e5f..37349bbffadba 100644 --- a/pom.xml +++ b/pom.xml @@ -2445,6 +2445,13 @@ flexible messaging model and an intuitive client API. + + pulsar-io-kafka-connect-tests + + pulsar-io + + + pulsar-sql-tests diff --git a/pulsar-io/pom.xml b/pulsar-io/pom.xml index e64c4a46c84df..69b2dcfe6bb96 100644 --- a/pulsar-io/pom.xml +++ b/pulsar-io/pom.xml @@ -91,15 +91,11 @@ cassandra aerospike http - kafka rabbitmq kinesis hdfs3 jdbc data-generator - kafka-connect-adaptor - kafka-connect-adaptor-nar - debezium hdfs2 canal file @@ -125,6 +121,18 @@ + + pulsar-io-kafka-connect-tests + + core + common + kafka + kafka-connect-adaptor + kafka-connect-adaptor-nar + debezium + + + core-modules From 7330e5adaffce011901b63c1394f582452b4a8ae Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 24 May 2023 13:27:19 +0300 Subject: [PATCH 3/3] Remove docs from pulsar-io-tests profile --- pulsar-io/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pulsar-io/pom.xml b/pulsar-io/pom.xml index 69b2dcfe6bb96..c1a58d059cd48 100644 --- a/pulsar-io/pom.xml +++ b/pulsar-io/pom.xml @@ -85,7 +85,6 @@ batch-discovery-triggerers batch-data-generator common - docs aws twitter cassandra