Skip to content

Commit af5ac34

Browse files
fix ci
1 parent 45b2d2a commit af5ac34

File tree

7 files changed

+10
-4
lines changed

7 files changed

+10
-4
lines changed

.ci/helm.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ function ci::install_pulsar_charts() {
9292
helm repo add grafana https://grafana.github.io/helm-charts
9393
helm repo update
9494
yq -i '.dependencies[0].repository = "https://grafana.github.io/helm-charts"' charts/pulsar/requirements.yaml
95+
# the superset chart seems got some issue, so we remove it
96+
yq -i 'del(.dependencies[1])' charts/pulsar/requirements.yaml
9597
helm dependency update charts/pulsar
9698
${HELM} install sn-platform --set initialize=true --values charts/pulsar/mini_values.yaml charts/pulsar --debug
9799

.ci/tests/integration-oauth2/e2e.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ setup:
3939
helm repo add grafana https://grafana.github.io/helm-charts
4040
helm repo update
4141
yq -i '.dependencies[0].repository = "https://grafana.github.io/helm-charts"' charts/pulsar/requirements.yaml
42+
yq -i 'del(.dependencies[1])' charts/pulsar/requirements.yaml
4243
helm dependency update charts/pulsar
4344
helm install ${PULSAR_RELEASE_NAME} --set initialize=true --values ../.ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml charts/pulsar
4445

.ci/tests/integration-oauth2/e2e_with_downloader.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ setup:
3939
helm repo add grafana https://grafana.github.io/helm-charts
4040
helm repo update
4141
yq -i '.dependencies[0].repository = "https://grafana.github.io/helm-charts"' charts/pulsar/requirements.yaml
42+
yq -i 'del(.dependencies[1])' charts/pulsar/requirements.yaml
4243
helm dependency update charts/pulsar
4344
helm install ${PULSAR_RELEASE_NAME} --set initialize=true --values ../.ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml charts/pulsar
4445

.ci/tests/integration/cases/logging-window-function/manifests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
windowConfig:
3737
windowLengthCount: 10
3838
slidingIntervalCount: 5
39-
processingGuarantee: ATLEAST_ONCE
39+
processingGuarantees: ATLEAST_ONCE
4040
# the processingGuarantee should be manual for window function
4141
# see: https://github.com/apache/pulsar/pull/16279/files#diff-c77c024ccb31c94a7aa80cb8e96d7e370709157bdc104a1be7867fb6c7aa0586R318-R319
4242
processingGuarantee: manual

.ci/tests/integration/cases/logging-window-function/verify.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ if [ $? -ne 0 ]; then
4444
fi
4545

4646
# verify the `processingGuarantees` config
47-
kubectl logs window-function-sample | grep processingGuarantees=ATLEAST_ONCE
47+
kubectl logs window-function-sample-function-0 | grep processingGuarantees=ATLEAST_ONCE
4848
if [ $? -ne 0 ]; then
4949
kubectl delete -f "${manifests_file}" > /dev/null 2>&1 || true
5050
exit 1
@@ -87,10 +87,10 @@ fi
8787
#fi
8888

8989
verify_log_result=$(kubectl logs -l compute.functionmesh.io/name=window-function-sample --tail=-1 | grep -e "-window-log" | wc -l)
90-
if [ $verify_log_result -ne 0 ]; then
90+
if [[ $verify_log_result -eq 15 ]]; then
9191
sub_name=$(echo $RANDOM | md5sum | head -c 20; echo;)
9292
verify_log_topic_result=$(kubectl exec -n ${PULSAR_NAMESPACE} ${PULSAR_RELEASE_NAME}-pulsar-broker-0 -- bin/pulsar-client consume -n 15 -s $sub_name --subscription-position Earliest "persistent://public/default/window-function-logs" | grep -e "-window-log" | wc -l)
93-
if [ $verify_log_topic_result -ne 0 ]; then
93+
if [[ $verify_log_topic_result -ne 0 ]]; then
9494
echo "e2e-test: ok" | yq eval -
9595
else
9696
echo "$verify_log_topic_result"

.ci/tests/integration/e2e.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ setup:
4545
helm repo add grafana https://grafana.github.io/helm-charts
4646
helm repo update
4747
yq -i '.dependencies[0].repository = "https://grafana.github.io/helm-charts"' charts/pulsar/requirements.yaml
48+
yq -i 'del(.dependencies[1])' charts/pulsar/requirements.yaml
4849
helm dependency update charts/pulsar
4950
helm install ${PULSAR_RELEASE_NAME} --set initialize=true --values ../.ci/clusters/values_skywalking_e2e_cluster.yaml charts/pulsar
5051

.ci/tests/integration/e2e_with_tls.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ setup:
3434
helm repo add grafana https://grafana.github.io/helm-charts
3535
helm repo update
3636
yq -i '.dependencies[0].repository = "https://grafana.github.io/helm-charts"' charts/pulsar/requirements.yaml
37+
yq -i 'del(.dependencies[1])' charts/pulsar/requirements.yaml
3738
helm dependency update charts/pulsar
3839
helm install ${PULSAR_RELEASE_NAME} --set initialize=true --values ../.ci/clusters/values_skywalking_e2e_cluster_with_tls.yaml charts/pulsar
3940

0 commit comments

Comments
 (0)