fix ci

streamnative · Nov 26, 2024 · af5ac34 · af5ac34
1 parent 45b2d2a
commit af5ac34
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 4 deletions.
diff --git a/.ci/helm.sh b/.ci/helm.sh
@@ -92,6 +92,8 @@ function ci::install_pulsar_charts() {
     helm repo add grafana https://grafana.github.io/helm-charts
     helm repo update
     yq -i '.dependencies[0].repository = "https://grafana.github.io/helm-charts"' charts/pulsar/requirements.yaml
+    # the superset chart seems got some issue, so we remove it
+    yq -i 'del(.dependencies[1])' charts/pulsar/requirements.yaml
     helm dependency update charts/pulsar
     ${HELM} install sn-platform --set initialize=true --values charts/pulsar/mini_values.yaml charts/pulsar --debug
 

diff --git a/.ci/tests/integration-oauth2/e2e.yaml b/.ci/tests/integration-oauth2/e2e.yaml
@@ -39,6 +39,7 @@ setup:
         helm repo add grafana https://grafana.github.io/helm-charts
         helm repo update
         yq -i '.dependencies[0].repository = "https://grafana.github.io/helm-charts"' charts/pulsar/requirements.yaml
+        yq -i 'del(.dependencies[1])' charts/pulsar/requirements.yaml
         helm dependency update charts/pulsar
         helm install ${PULSAR_RELEASE_NAME} --set initialize=true --values ../.ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml charts/pulsar
 

diff --git a/.ci/tests/integration-oauth2/e2e_with_downloader.yaml b/.ci/tests/integration-oauth2/e2e_with_downloader.yaml
@@ -39,6 +39,7 @@ setup:
         helm repo add grafana https://grafana.github.io/helm-charts
         helm repo update
         yq -i '.dependencies[0].repository = "https://grafana.github.io/helm-charts"' charts/pulsar/requirements.yaml
+        yq -i 'del(.dependencies[1])' charts/pulsar/requirements.yaml
         helm dependency update charts/pulsar
         helm install ${PULSAR_RELEASE_NAME} --set initialize=true --values ../.ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml charts/pulsar
 

diff --git a/.ci/tests/integration/cases/logging-window-function/manifests.yaml b/.ci/tests/integration/cases/logging-window-function/manifests.yaml
@@ -36,7 +36,7 @@ spec:
   windowConfig:
     windowLengthCount: 10
     slidingIntervalCount: 5
-    processingGuarantee: ATLEAST_ONCE
+    processingGuarantees: ATLEAST_ONCE
   # the processingGuarantee should be manual for window function
   # see: https://github.com/apache/pulsar/pull/16279/files#diff-c77c024ccb31c94a7aa80cb8e96d7e370709157bdc104a1be7867fb6c7aa0586R318-R319
   processingGuarantee: manual

diff --git a/.ci/tests/integration/cases/logging-window-function/verify.sh b/.ci/tests/integration/cases/logging-window-function/verify.sh
@@ -44,7 +44,7 @@ if [ $? -ne 0 ]; then
 fi
 
 # verify the `processingGuarantees` config
-kubectl logs window-function-sample | grep processingGuarantees=ATLEAST_ONCE
+kubectl logs window-function-sample-function-0 | grep processingGuarantees=ATLEAST_ONCE
 if [ $? -ne 0 ]; then
   kubectl delete -f "${manifests_file}" > /dev/null 2>&1 || true
   exit 1
@@ -87,10 +87,10 @@ fi
 #fi
 
 verify_log_result=$(kubectl logs -l compute.functionmesh.io/name=window-function-sample --tail=-1 | grep -e "-window-log" | wc -l)
-if [ $verify_log_result -ne 0 ]; then
+if [[ $verify_log_result -eq 15 ]]; then
   sub_name=$(echo $RANDOM | md5sum | head -c 20; echo;)
   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)
-  if [ $verify_log_topic_result -ne 0 ]; then
+  if [[ $verify_log_topic_result -ne 0 ]]; then
     echo "e2e-test: ok" | yq eval -
   else
     echo "$verify_log_topic_result"

diff --git a/.ci/tests/integration/e2e.yaml b/.ci/tests/integration/e2e.yaml
@@ -45,6 +45,7 @@ setup:
         helm repo add grafana https://grafana.github.io/helm-charts
         helm repo update
         yq -i '.dependencies[0].repository = "https://grafana.github.io/helm-charts"' charts/pulsar/requirements.yaml
+        yq -i 'del(.dependencies[1])' charts/pulsar/requirements.yaml
         helm dependency update charts/pulsar
         helm install ${PULSAR_RELEASE_NAME} --set initialize=true --values ../.ci/clusters/values_skywalking_e2e_cluster.yaml charts/pulsar
 

diff --git a/.ci/tests/integration/e2e_with_tls.yaml b/.ci/tests/integration/e2e_with_tls.yaml
@@ -34,6 +34,7 @@ setup:
         helm repo add grafana https://grafana.github.io/helm-charts
         helm repo update
         yq -i '.dependencies[0].repository = "https://grafana.github.io/helm-charts"' charts/pulsar/requirements.yaml
+        yq -i 'del(.dependencies[1])' charts/pulsar/requirements.yaml
         helm dependency update charts/pulsar
         helm install ${PULSAR_RELEASE_NAME} --set initialize=true --values ../.ci/clusters/values_skywalking_e2e_cluster_with_tls.yaml charts/pulsar