Skip to content

Commit

Permalink
Fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
@jiangpengcheng
jiangpengcheng committed Apr 9, 2024
1 parent 7ed10bb commit f4e9922
Show file tree
Hide file tree
Showing 10 changed files with 48 additions and 48 deletions.
18 changes: 9 additions & 9 deletions .ci/clusters/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions .ci/clusters/values_custom_runner_images.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
Expand Down Expand Up @@ -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:
Expand Down
18 changes: 9 additions & 9 deletions .ci/clusters/values_runner_images.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
Expand Down Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions .ci/clusters/values_skywalking_e2e_cluster.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .ci/clusters/values_skywalking_e2e_cluster_with_tls.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci/tests/integration-oauth2/cases/batch-source/verify.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci/tests/integration-oauth2/cases/java-download-function/verify.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci/tests/integration/cases/java-download-function/verify.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci/tests/integration/cases/mongodb-source/verify.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f4e9922

Please sign in to comment.