From f4e9922a7f415ac1ba79f601e71600c293b27377 Mon Sep 17 00:00:00 2001 From: jiangpengcheng Date: Tue, 9 Apr 2024 10:28:52 +0800 Subject: [PATCH] Fix ci --- .ci/clusters/values.yaml | 18 +++++++++--------- .ci/clusters/values_custom_runner_images.yaml | 16 ++++++++-------- .ci/clusters/values_runner_images.yaml | 18 +++++++++--------- .../values_skywalking_e2e_cluster.yaml | 12 ++++++------ ...lues_skywalking_e2e_cluster_with_oauth.yaml | 12 ++++++------ ...values_skywalking_e2e_cluster_with_tls.yaml | 12 ++++++------ .../cases/batch-source/verify.sh | 2 +- .../cases/java-download-function/verify.sh | 2 +- .../cases/java-download-function/verify.sh | 2 +- .../integration/cases/mongodb-source/verify.sh | 2 +- 10 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.ci/clusters/values.yaml b/.ci/clusters/values.yaml index 8a4d397bc..e8c994f7c 100644 --- a/.ci/clusters/values.yaml +++ b/.ci/clusters/values.yaml @@ -45,25 +45,25 @@ monitoring: images: zookeeper: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 bookie: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 autorecovery: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 broker: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 functions: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 proxy: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 presto: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 zookeeper: replicaCount: 1 @@ -74,7 +74,7 @@ bookkeeper: metadata: image: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 configData: PULSAR_PREFIX_autoRecoveryDaemonEnabled: "false" PULSAR_PREFIX_dlog.bkcEnsembleSize: "1" @@ -108,7 +108,7 @@ bookkeeper: pulsar_metadata: image: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 broker: replicaCount: 1 diff --git a/.ci/clusters/values_custom_runner_images.yaml b/.ci/clusters/values_custom_runner_images.yaml index 96898cfe6..30dde9839 100644 --- a/.ci/clusters/values_custom_runner_images.yaml +++ b/.ci/clusters/values_custom_runner_images.yaml @@ -41,27 +41,27 @@ monitoring: images: zookeeper: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 pullPolicy: IfNotPresent bookie: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 pullPolicy: IfNotPresent autorecovery: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 pullPolicy: IfNotPresent broker: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 pullPolicy: IfNotPresent proxy: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 pullPolicy: IfNotPresent functions: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 pullPolicy: IfNotPresent zookeeper: @@ -72,7 +72,7 @@ bookkeeper: metadata: image: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 configData: PULSAR_PREFIX_autoRecoveryDaemonEnabled: "false" PULSAR_PREFIX_dlog.bkcEnsembleSize: "1" @@ -109,7 +109,7 @@ bookkeeper: pulsar_metadata: image: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 pullPolicy: IfNotPresent broker: diff --git a/.ci/clusters/values_runner_images.yaml b/.ci/clusters/values_runner_images.yaml index 3f6adc29e..a2a5325e9 100644 --- a/.ci/clusters/values_runner_images.yaml +++ b/.ci/clusters/values_runner_images.yaml @@ -41,31 +41,31 @@ monitoring: images: zookeeper: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 pullPolicy: IfNotPresent bookie: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 pullPolicy: IfNotPresent autorecovery: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 pullPolicy: IfNotPresent broker: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 pullPolicy: IfNotPresent proxy: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 pullPolicy: IfNotPresent functions: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 pullPolicy: IfNotPresent presto: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 pullPolicy: IfNotPresent zookeeper: @@ -76,7 +76,7 @@ bookkeeper: metadata: image: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 configData: PULSAR_PREFIX_autoRecoveryDaemonEnabled: "false" PULSAR_PREFIX_dlog.bkcEnsembleSize: "1" @@ -110,7 +110,7 @@ bookkeeper: pulsar_metadata: image: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 pullPolicy: IfNotPresent broker: diff --git a/.ci/clusters/values_skywalking_e2e_cluster.yaml b/.ci/clusters/values_skywalking_e2e_cluster.yaml index 0bd357c4b..99824113e 100644 --- a/.ci/clusters/values_skywalking_e2e_cluster.yaml +++ b/.ci/clusters/values_skywalking_e2e_cluster.yaml @@ -44,16 +44,16 @@ monitoring: images: zookeeper: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 bookie: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 broker: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 functions: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 zookeeper: replicaCount: 1 @@ -67,7 +67,7 @@ bookkeeper: metadata: image: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 resources: requests: memory: 256Mi @@ -105,7 +105,7 @@ bookkeeper: pulsar_metadata: image: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 broker: replicaCount: 1 diff --git a/.ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml b/.ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml index 900fae2e6..6467dec0d 100644 --- a/.ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml +++ b/.ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml @@ -44,16 +44,16 @@ monitoring: images: zookeeper: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 bookie: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 broker: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 functions: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 zookeeper: replicaCount: 1 @@ -67,7 +67,7 @@ bookkeeper: metadata: image: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 resources: requests: memory: 256Mi @@ -105,7 +105,7 @@ bookkeeper: pulsar_metadata: image: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 broker: replicaCount: 1 diff --git a/.ci/clusters/values_skywalking_e2e_cluster_with_tls.yaml b/.ci/clusters/values_skywalking_e2e_cluster_with_tls.yaml index d2c5e3db1..cfdb9e86b 100644 --- a/.ci/clusters/values_skywalking_e2e_cluster_with_tls.yaml +++ b/.ci/clusters/values_skywalking_e2e_cluster_with_tls.yaml @@ -44,16 +44,16 @@ monitoring: images: zookeeper: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 bookie: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 broker: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 functions: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 zookeeper: replicaCount: 1 @@ -67,7 +67,7 @@ bookkeeper: metadata: image: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 resources: requests: memory: 256Mi @@ -105,7 +105,7 @@ bookkeeper: pulsar_metadata: image: repository: streamnative/sn-platform - tag: 3.2.2.1 + tag: 2.9.2.23 broker: replicaCount: 1 diff --git a/.ci/tests/integration-oauth2/cases/batch-source/verify.sh b/.ci/tests/integration-oauth2/cases/batch-source/verify.sh index 306187892..9b92ea0d1 100644 --- a/.ci/tests/integration-oauth2/cases/batch-source/verify.sh +++ b/.ci/tests/integration-oauth2/cases/batch-source/verify.sh @@ -50,7 +50,7 @@ if [ $? -ne 0 ]; then exit 1 fi -verify_log_topic=$(ci::verify_log_topic_with_auth persistent://public/default/batch-source-logs "org.apache.pulsar.functions.runtime.JavaInstanceStarter" 10 2>&1) +verify_log_topic=$(ci::verify_log_topic_with_auth persistent://public/default/batch-source-logs "it may be a NAR file" 10 2>&1) if [ $? -ne 0 ]; then echo "$verify_log_topic" kubectl delete -f "${manifests_file}" > /dev/null 2>&1 || true diff --git a/.ci/tests/integration-oauth2/cases/java-download-function/verify.sh b/.ci/tests/integration-oauth2/cases/java-download-function/verify.sh index d709ae5d5..bb6e54af5 100644 --- a/.ci/tests/integration-oauth2/cases/java-download-function/verify.sh +++ b/.ci/tests/integration-oauth2/cases/java-download-function/verify.sh @@ -48,7 +48,7 @@ if [ $? -ne 0 ]; then exit 1 fi -verify_log_topic=$(ci::verify_log_topic_with_auth persistent://public/default/logging-function-logs-sidecar "org.apache.pulsar.functions.runtime.JavaInstanceStarter" 10 2>&1) +verify_log_topic=$(ci::verify_log_topic_with_auth persistent://public/default/logging-function-logs-sidecar "it is not a NAR file" 10 2>&1) if [ $? -ne 0 ]; then echo "$verify_log_topic" kubectl delete -f "${BASE_DIR}"/.ci/tests/integration-oauth2/cases/java-download-function/manifests.yaml > /dev/null 2>&1 || true diff --git a/.ci/tests/integration/cases/java-download-function/verify.sh b/.ci/tests/integration/cases/java-download-function/verify.sh index 591974cb1..b40904261 100644 --- a/.ci/tests/integration/cases/java-download-function/verify.sh +++ b/.ci/tests/integration/cases/java-download-function/verify.sh @@ -55,7 +55,7 @@ if [ $? -ne 0 ]; then fi if [ $USE_TLS == "false" ]; then - verify_log_topic=$(ci::verify_log_topic persistent://public/default/logging-function-logs-sidecar "org.apache.pulsar.functions.runtime.JavaInstanceStarter" 10 2>&1) + verify_log_topic=$(ci::verify_log_topic persistent://public/default/logging-function-logs-sidecar "it is not a NAR file" 10 2>&1) if [ $? -ne 0 ]; then echo "$verify_log_topic" kubectl delete -f "${BASE_DIR}"/.ci/tests/integration/cases/java-download-function/manifests.yaml > /dev/null 2>&1 || true diff --git a/.ci/tests/integration/cases/mongodb-source/verify.sh b/.ci/tests/integration/cases/mongodb-source/verify.sh index 5f41493c4..2d9c0b382 100644 --- a/.ci/tests/integration/cases/mongodb-source/verify.sh +++ b/.ci/tests/integration/cases/mongodb-source/verify.sh @@ -78,7 +78,7 @@ if [ $? -ne 0 ]; then fi if [ $USE_TLS == "false" ]; then - verify_log_topic=$(ci::verify_log_topic persistent://public/default/mongo-source-logs "org.apache.pulsar.functions.runtime.JavaInstanceStarter" 10 2>&1) + verify_log_topic=$(ci::verify_log_topic persistent://public/default/mongo-source-logs "it may be a NAR file" 10 2>&1) if [ $? -ne 0 ]; then echo "$verify_log_topic" kubectl delete -f "${manifests_file}" > /dev/null 2>&1 || true