From 31e28fc92bd2e113bf355977cf7f0437385fdeb8 Mon Sep 17 00:00:00 2001 From: ArkBriar Date: Mon, 6 May 2024 18:02:37 +0800 Subject: [PATCH] chore: bump risingwave to v1.8.2 (#642) * chore: bump risingwave to v1.8.1 Signed-off-by: arkbriar * Try fixing e2e test, use etcd v3.4.32 instead of latest Signed-off-by: arkbriar * Bump kind node image Signed-off-by: arkbriar * Fix lib.sh Signed-off-by: arkbriar * Bump cert-manager version in E2E Signed-off-by: arkbriar * Bump to v1.8.2 Signed-off-by: arkbriar * Increase timeout interval for service waiting Signed-off-by: arkbriar * Revert "Bump kind node image" This reverts commit bb868ffe7dc03d4b0d1ed4bcc7a6fde9890126cc. * Add additional sleep Signed-off-by: arkbriar * Workaround by waiting for 30 more seconds Signed-off-by: arkbriar --------- Signed-off-by: arkbriar --- docs/general/aws-eks-iam-for-s3.md | 2 +- .../separate-batch-streaming-modes.yaml | 4 ++-- .../risingwave/risingwave-aliyun-oss.yaml | 2 +- .../risingwave-customize-config.yaml | 2 +- .../risingwave/risingwave-etcd-auth.yaml | 4 ++-- .../risingwave/risingwave-etcd-azure.yaml | 4 ++-- .../risingwave/risingwave-etcd-hdfs.yaml | 2 +- .../risingwave-etcd-local-disk.yaml | 4 ++-- .../risingwave/risingwave-etcd-minio.yaml | 4 ++-- .../risingwave/risingwave-etcd-s3.yaml | 4 ++-- docs/manifests/risingwave/risingwave-gcs.yaml | 2 +- .../risingwave-huaweicloud-obs.yaml | 2 +- .../risingwave-im-memory-azure.yaml | 2 +- .../risingwave/risingwave-in-memory.yaml | 2 +- .../risingwave/risingwave-s3-compatible.yaml | 2 +- .../risingwave/risingwave-standalone.yaml | 2 +- .../sv-example-frontend.yaml | 2 +- .../sv-spot-compactor.yaml | 2 +- docs/manifests/stable/memory/risingwave.yaml | 2 +- .../stable/persistent/minio/risingwave.yaml | 4 ++-- .../stable/persistent/s3/risingwave.yaml | 4 ++-- hack/scripts/install.sh | 2 +- pytest/conftest.py | 6 +++++ pytest/test_deployment.py | 0 pytest/test_failover.py | 0 pytest/test_installation.py | 0 pytest/test_scaling.py | 0 pytest/test_update.py | 0 test/e2e/env | 2 +- test/e2e/testenv/lib.sh | 4 ++-- test/e2e/testenv/util/lib.sh | 6 +++-- .../manifests/multi-meta/multi-meta.yaml | 2 +- .../manifests/standalone/standalone.yaml | 2 +- .../manifests/storages/meta-etcd.yaml | 2 +- test/e2e/tests/risingwave/tests.sh | 24 +++++++++++++++++++ test/e2e/tests/tests.sh | 2 +- 36 files changed, 71 insertions(+), 39 deletions(-) create mode 100644 pytest/conftest.py create mode 100644 pytest/test_deployment.py create mode 100644 pytest/test_failover.py create mode 100644 pytest/test_installation.py create mode 100644 pytest/test_scaling.py create mode 100644 pytest/test_update.py diff --git a/docs/general/aws-eks-iam-for-s3.md b/docs/general/aws-eks-iam-for-s3.md index 6fd09307..b69e4e04 100644 --- a/docs/general/aws-eks-iam-for-s3.md +++ b/docs/general/aws-eks-iam-for-s3.md @@ -41,7 +41,7 @@ kind: RisingWave metadata: name: risingwave spec: - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 # metaStore: # etcd: # endpoint: etcd:2388 diff --git a/docs/manifests/risingwave/advanced/separate-batch-streaming-modes.yaml b/docs/manifests/risingwave/advanced/separate-batch-streaming-modes.yaml index f33fd208..2c79bab5 100644 --- a/docs/manifests/risingwave/advanced/separate-batch-streaming-modes.yaml +++ b/docs/manifests/risingwave/advanced/separate-batch-streaming-modes.yaml @@ -32,7 +32,7 @@ spec: spec: containers: - name: etcd - image: quay.io/coreos/etcd:latest + image: quay.io/coreos/etcd:v3.4.32 imagePullPolicy: IfNotPresent command: - /usr/local/bin/etcd @@ -87,7 +87,7 @@ spec: accessKeyRef: AccessKeyID secretAccessKeyRef: SecretAccessKey region: ap-southeast-1 - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 components: meta: nodeGroups: diff --git a/docs/manifests/risingwave/risingwave-aliyun-oss.yaml b/docs/manifests/risingwave/risingwave-aliyun-oss.yaml index cf2e4a94..66f0147b 100644 --- a/docs/manifests/risingwave/risingwave-aliyun-oss.yaml +++ b/docs/manifests/risingwave/risingwave-aliyun-oss.yaml @@ -21,7 +21,7 @@ spec: internalEndpoint: false credentials: secretName: risingwave-aliyun-oss-credentials - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 components: meta: nodeGroups: diff --git a/docs/manifests/risingwave/risingwave-customize-config.yaml b/docs/manifests/risingwave/risingwave-customize-config.yaml index 567917d1..8c8e5174 100644 --- a/docs/manifests/risingwave/risingwave-customize-config.yaml +++ b/docs/manifests/risingwave/risingwave-customize-config.yaml @@ -37,7 +37,7 @@ spec: memory: true stateStore: memory: true - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 components: meta: nodeGroups: diff --git a/docs/manifests/risingwave/risingwave-etcd-auth.yaml b/docs/manifests/risingwave/risingwave-etcd-auth.yaml index eb3c451c..051c182e 100644 --- a/docs/manifests/risingwave/risingwave-etcd-auth.yaml +++ b/docs/manifests/risingwave/risingwave-etcd-auth.yaml @@ -33,7 +33,7 @@ spec: enableServiceLinks: false containers: - name: etcd - image: quay.io/coreos/etcd:latest + image: quay.io/coreos/etcd:v3.4.32 imagePullPolicy: IfNotPresent lifecycle: postStart: @@ -97,7 +97,7 @@ spec: passwordKeyRef: password stateStore: memory: true - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 components: meta: nodeGroups: diff --git a/docs/manifests/risingwave/risingwave-etcd-azure.yaml b/docs/manifests/risingwave/risingwave-etcd-azure.yaml index 8d6f8166..683ba375 100644 --- a/docs/manifests/risingwave/risingwave-etcd-azure.yaml +++ b/docs/manifests/risingwave/risingwave-etcd-azure.yaml @@ -32,7 +32,7 @@ spec: spec: containers: - name: etcd - image: quay.io/coreos/etcd:latest + image: quay.io/coreos/etcd:v3.4.32 imagePullPolicy: IfNotPresent command: - /usr/local/bin/etcd @@ -93,7 +93,7 @@ spec: container: your-azure-container-name root: risingwave endpoint: https://your-azure-account-name.blob.core.windows.net - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 components: meta: nodeGroups: diff --git a/docs/manifests/risingwave/risingwave-etcd-hdfs.yaml b/docs/manifests/risingwave/risingwave-etcd-hdfs.yaml index 2541dc0e..4b718c36 100644 --- a/docs/manifests/risingwave/risingwave-etcd-hdfs.yaml +++ b/docs/manifests/risingwave/risingwave-etcd-hdfs.yaml @@ -345,7 +345,7 @@ spec: spec: containers: - name: etcd - image: quay.io/coreos/etcd:latest + image: quay.io/coreos/etcd:v3.4.32 imagePullPolicy: IfNotPresent command: - /usr/local/bin/etcd diff --git a/docs/manifests/risingwave/risingwave-etcd-local-disk.yaml b/docs/manifests/risingwave/risingwave-etcd-local-disk.yaml index 07ca4918..fff2342b 100644 --- a/docs/manifests/risingwave/risingwave-etcd-local-disk.yaml +++ b/docs/manifests/risingwave/risingwave-etcd-local-disk.yaml @@ -44,7 +44,7 @@ spec: spec: containers: - name: etcd - image: quay.io/coreos/etcd:latest + image: quay.io/coreos/etcd:v3.4.32 imagePullPolicy: IfNotPresent command: - /usr/local/bin/etcd @@ -105,7 +105,7 @@ kind: RisingWave metadata: name: risingwave spec: - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 metaStore: etcd: endpoint: etcd:2388 diff --git a/docs/manifests/risingwave/risingwave-etcd-minio.yaml b/docs/manifests/risingwave/risingwave-etcd-minio.yaml index 0b181ebb..70691dd6 100644 --- a/docs/manifests/risingwave/risingwave-etcd-minio.yaml +++ b/docs/manifests/risingwave/risingwave-etcd-minio.yaml @@ -32,7 +32,7 @@ spec: spec: containers: - name: etcd - image: quay.io/coreos/etcd:latest + image: quay.io/coreos/etcd:v3.4.32 imagePullPolicy: IfNotPresent command: - /usr/local/bin/etcd @@ -154,7 +154,7 @@ spec: usernameKeyRef: username passwordKeyRef: password endpoint: risingwave-minio:9301 - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 components: meta: nodeGroups: diff --git a/docs/manifests/risingwave/risingwave-etcd-s3.yaml b/docs/manifests/risingwave/risingwave-etcd-s3.yaml index c3ad3b2a..a14b1c21 100644 --- a/docs/manifests/risingwave/risingwave-etcd-s3.yaml +++ b/docs/manifests/risingwave/risingwave-etcd-s3.yaml @@ -32,7 +32,7 @@ spec: spec: containers: - name: etcd - image: quay.io/coreos/etcd:latest + image: quay.io/coreos/etcd:v3.4.32 imagePullPolicy: IfNotPresent command: - /usr/local/bin/etcd @@ -87,7 +87,7 @@ spec: accessKeyRef: AccessKeyID secretAccessKeyRef: SecretAccessKey region: ap-southeast-1 - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 components: meta: nodeGroups: diff --git a/docs/manifests/risingwave/risingwave-gcs.yaml b/docs/manifests/risingwave/risingwave-gcs.yaml index d8414a18..d3f249d6 100644 --- a/docs/manifests/risingwave/risingwave-gcs.yaml +++ b/docs/manifests/risingwave/risingwave-gcs.yaml @@ -19,7 +19,7 @@ spec: credentials: secretName: gcs-credentials serviceAccountCredentialsKeyRef: ServiceAccountCredentials - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 components: meta: nodeGroups: diff --git a/docs/manifests/risingwave/risingwave-huaweicloud-obs.yaml b/docs/manifests/risingwave/risingwave-huaweicloud-obs.yaml index d3e4233a..7c3c1bc7 100644 --- a/docs/manifests/risingwave/risingwave-huaweicloud-obs.yaml +++ b/docs/manifests/risingwave/risingwave-huaweicloud-obs.yaml @@ -19,7 +19,7 @@ spec: region: ap-southeast-2 credentials: secretName: risingwave-huaweicloud-obs-credentials - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 components: meta: nodeGroups: diff --git a/docs/manifests/risingwave/risingwave-im-memory-azure.yaml b/docs/manifests/risingwave/risingwave-im-memory-azure.yaml index 0e88a6a2..a107725e 100644 --- a/docs/manifests/risingwave/risingwave-im-memory-azure.yaml +++ b/docs/manifests/risingwave/risingwave-im-memory-azure.yaml @@ -20,7 +20,7 @@ spec: container: your-azure-container-name root: risingwave endpoint: https://your-azure-account-name.blob.core.windows.net - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 components: meta: nodeGroups: diff --git a/docs/manifests/risingwave/risingwave-in-memory.yaml b/docs/manifests/risingwave/risingwave-in-memory.yaml index 511353e6..f463ddb1 100644 --- a/docs/manifests/risingwave/risingwave-in-memory.yaml +++ b/docs/manifests/risingwave/risingwave-in-memory.yaml @@ -7,7 +7,7 @@ spec: memory: true stateStore: memory: true - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 components: meta: nodeGroups: diff --git a/docs/manifests/risingwave/risingwave-s3-compatible.yaml b/docs/manifests/risingwave/risingwave-s3-compatible.yaml index 02b101fe..905eaa3b 100644 --- a/docs/manifests/risingwave/risingwave-s3-compatible.yaml +++ b/docs/manifests/risingwave/risingwave-s3-compatible.yaml @@ -20,7 +20,7 @@ spec: region: ap-guangzhou credentials: secretName: cos-credentials - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 components: meta: nodeGroups: diff --git a/docs/manifests/risingwave/risingwave-standalone.yaml b/docs/manifests/risingwave/risingwave-standalone.yaml index 2e297cfa..730b7aa6 100644 --- a/docs/manifests/risingwave/risingwave-standalone.yaml +++ b/docs/manifests/risingwave/risingwave-standalone.yaml @@ -3,7 +3,7 @@ kind: RisingWave metadata: name: risingwave-standalone spec: - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 enableStandaloneMode: true components: standalone: diff --git a/docs/manifests/risingwavescaleview/sv-example-frontend.yaml b/docs/manifests/risingwavescaleview/sv-example-frontend.yaml index b10b9bba..2ea57d3f 100644 --- a/docs/manifests/risingwavescaleview/sv-example-frontend.yaml +++ b/docs/manifests/risingwavescaleview/sv-example-frontend.yaml @@ -3,7 +3,7 @@ kind: RisingWave metadata: name: sv-example spec: - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 components: meta: nodeGroups: diff --git a/docs/manifests/risingwavescaleview/sv-spot-compactor.yaml b/docs/manifests/risingwavescaleview/sv-spot-compactor.yaml index d78ea100..4a2e9044 100644 --- a/docs/manifests/risingwavescaleview/sv-spot-compactor.yaml +++ b/docs/manifests/risingwavescaleview/sv-spot-compactor.yaml @@ -3,7 +3,7 @@ kind: RisingWave metadata: name: sv-example spec: - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 components: meta: nodeGroups: diff --git a/docs/manifests/stable/memory/risingwave.yaml b/docs/manifests/stable/memory/risingwave.yaml index e7f55362..2bf23581 100644 --- a/docs/manifests/stable/memory/risingwave.yaml +++ b/docs/manifests/stable/memory/risingwave.yaml @@ -3,7 +3,7 @@ kind: RisingWave metadata: name: risingwave spec: - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 metaStore: memory: true stateStore: diff --git a/docs/manifests/stable/persistent/minio/risingwave.yaml b/docs/manifests/stable/persistent/minio/risingwave.yaml index 9c640c41..a26bf373 100644 --- a/docs/manifests/stable/persistent/minio/risingwave.yaml +++ b/docs/manifests/stable/persistent/minio/risingwave.yaml @@ -44,7 +44,7 @@ spec: spec: containers: - name: etcd - image: quay.io/coreos/etcd:latest + image: quay.io/coreos/etcd:v3.4.32 imagePullPolicy: IfNotPresent command: - /usr/local/bin/etcd @@ -177,7 +177,7 @@ kind: RisingWave metadata: name: risingwave spec: - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 metaStore: etcd: endpoint: etcd:2388 diff --git a/docs/manifests/stable/persistent/s3/risingwave.yaml b/docs/manifests/stable/persistent/s3/risingwave.yaml index cb81fe4c..15bdadb6 100644 --- a/docs/manifests/stable/persistent/s3/risingwave.yaml +++ b/docs/manifests/stable/persistent/s3/risingwave.yaml @@ -44,7 +44,7 @@ spec: spec: containers: - name: etcd - image: quay.io/coreos/etcd:latest + image: quay.io/coreos/etcd:v3.4.32 imagePullPolicy: IfNotPresent command: - /usr/local/bin/etcd @@ -94,7 +94,7 @@ kind: RisingWave metadata: name: risingwave spec: - image: risingwavelabs/risingwave:v1.7.3 + image: risingwavelabs/risingwave:v1.8.2 metaStore: etcd: endpoint: etcd:2388 diff --git a/hack/scripts/install.sh b/hack/scripts/install.sh index 97df0059..44053bd2 100755 --- a/hack/scripts/install.sh +++ b/hack/scripts/install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -CERT_MANAGER_VERSION=${CERT_MANAGER_VERSION:-v1.11.0} +CERT_MANAGER_VERSION=${CERT_MANAGER_VERSION:-v1.14.5} RISINGWAVE_OPERATOR_VERSION=${RISINGWAVE_OPERATOR_VERSION:-latest} function link_to_risingwave_operator_manifests() { diff --git a/pytest/conftest.py b/pytest/conftest.py new file mode 100644 index 00000000..081e7290 --- /dev/null +++ b/pytest/conftest.py @@ -0,0 +1,6 @@ +def pytest_configure(config): + pass + + +def pytest_unconfigure(config): + pass diff --git a/pytest/test_deployment.py b/pytest/test_deployment.py new file mode 100644 index 00000000..e69de29b diff --git a/pytest/test_failover.py b/pytest/test_failover.py new file mode 100644 index 00000000..e69de29b diff --git a/pytest/test_installation.py b/pytest/test_installation.py new file mode 100644 index 00000000..e69de29b diff --git a/pytest/test_scaling.py b/pytest/test_scaling.py new file mode 100644 index 00000000..e69de29b diff --git a/pytest/test_update.py b/pytest/test_update.py new file mode 100644 index 00000000..e69de29b diff --git a/test/e2e/env b/test/e2e/env index 156148f2..19b69945 100644 --- a/test/e2e/env +++ b/test/e2e/env @@ -1,5 +1,5 @@ E2E_KUBERNETES_RUNTIME=kind -E2E_RISINGWAVE_IMAGE=risingwavelabs/risingwave:v1.7.3 +E2E_RISINGWAVE_IMAGE=risingwavelabs/risingwave:v1.8.2 E2E_AWS_S3_REGION= E2E_AWS_S3_BUCKET= E2E_AWS_ACCESS_KEY_ID= diff --git a/test/e2e/testenv/lib.sh b/test/e2e/testenv/lib.sh index e986744a..7122d9e8 100644 --- a/test/e2e/testenv/lib.sh +++ b/test/e2e/testenv/lib.sh @@ -117,14 +117,14 @@ function testenv::k8s::load_docker_image() { } function testenv::k8s::cert_manager::install() { - local version=${CERT_MANAGER_VERSION:-v1.9.1} + local version=${CERT_MANAGER_VERSION:-v1.14.5} shell::run k8s::kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/"${version}"/cert-manager.yaml testenv::k8s::cert_manager::_wait } function testenv::k8s::cert_manager::uninstall() { - local version=${CERT_MANAGER_VERSION:-v1.9.1} + local version=${CERT_MANAGER_VERSION:-v1.14.5} shell::run k8s::kubectl delete -f https://github.com/cert-manager/cert-manager/releases/download/"${version}"/cert-manager.yaml } diff --git a/test/e2e/testenv/util/lib.sh b/test/e2e/testenv/util/lib.sh index 0e639efb..298bb9ee 100644 --- a/test/e2e/testenv/util/lib.sh +++ b/test/e2e/testenv/util/lib.sh @@ -66,7 +66,7 @@ function testenv::util::uninstall() { } function testenv::util::psql() { - if [[ -n ${PSQL_SCRIPT_FILE} ]]; then + if [[ -n ${PSQL_SCRIPT_FILE+x} ]]; then kubectl -n "${_UTIL_NAMESPACE}" exec -i psql -c psql -- psql "$@" <"${PSQL_SCRIPT_FILE}" else kubectl -n "${_UTIL_NAMESPACE}" exec -i psql -c psql -- psql "$@" @@ -109,9 +109,11 @@ function testenv::util::network::is_k8s_service_up() { } function testenv::util::network::wait_before_service_up() { - local threshold=60 + local threshold=120 local current_epoch=0 local interval=5 + local namespace=$1 + local service=$2 while :; do if testenv::util::network::is_k8s_service_up "${@}"; then break diff --git a/test/e2e/tests/risingwave/manifests/multi-meta/multi-meta.yaml b/test/e2e/tests/risingwave/manifests/multi-meta/multi-meta.yaml index 2f3e519f..85d580cc 100644 --- a/test/e2e/tests/risingwave/manifests/multi-meta/multi-meta.yaml +++ b/test/e2e/tests/risingwave/manifests/multi-meta/multi-meta.yaml @@ -34,7 +34,7 @@ spec: spec: containers: - name: etcd - image: quay.io/coreos/etcd:latest + image: quay.io/coreos/etcd:v3.4.32 imagePullPolicy: IfNotPresent command: - /usr/local/bin/etcd diff --git a/test/e2e/tests/risingwave/manifests/standalone/standalone.yaml b/test/e2e/tests/risingwave/manifests/standalone/standalone.yaml index b1b542b5..2c27041c 100644 --- a/test/e2e/tests/risingwave/manifests/standalone/standalone.yaml +++ b/test/e2e/tests/risingwave/manifests/standalone/standalone.yaml @@ -34,7 +34,7 @@ spec: spec: containers: - name: etcd - image: quay.io/coreos/etcd:latest + image: quay.io/coreos/etcd:v3.4.32 imagePullPolicy: IfNotPresent command: - /usr/local/bin/etcd diff --git a/test/e2e/tests/risingwave/manifests/storages/meta-etcd.yaml b/test/e2e/tests/risingwave/manifests/storages/meta-etcd.yaml index 876be182..8936b1ae 100644 --- a/test/e2e/tests/risingwave/manifests/storages/meta-etcd.yaml +++ b/test/e2e/tests/risingwave/manifests/storages/meta-etcd.yaml @@ -34,7 +34,7 @@ spec: spec: containers: - name: etcd - image: quay.io/coreos/etcd:latest + image: quay.io/coreos/etcd:v3.4.32 imagePullPolicy: IfNotPresent command: - /usr/local/bin/etcd diff --git a/test/e2e/tests/risingwave/tests.sh b/test/e2e/tests/risingwave/tests.sh index f09599ff..7ca94d6a 100644 --- a/test/e2e/tests/risingwave/tests.sh +++ b/test/e2e/tests/risingwave/tests.sh @@ -160,10 +160,34 @@ function test::run::risingwave::multi_meta_failover() { logging::info "Stopped!" } +function test::risingwave::wait_before_compute_registered() { + local frontend_service_port + frontend_service_port=$(k8s::kubectl get svc/"${E2E_RISINGWAVE_NAME}-frontend" -o jsonpath='{.spec.ports[?(@.name=="service")].port}') + + # Ensure at least one worker has been registered. + for _ in {0..10}; do + if testenv::util::psql -X -v ON_ERROR_STOP=1 -h "${E2E_RISINGWAVE_NAME}-frontend.${E2E_NAMESPACE}" \ + -p "${frontend_service_port}" -d dev -U root \ + -t -c "select * from rw_worker_nodes where type='WORKER_TYPE_COMPUTE_NODE' and state='RUNNING'" | grep -q "."; then + # sleep 30 more seconds for DNS to be propagated + sleep 30 + return 0 + else + logging::warn "No compute node registered yet!" + sleep 3 + fi + done + + logging::error "No compute node registered!" + return 1 +} + function test::risingwave::check_status_with_simple_queries() { local frontend_service_port frontend_service_port=$(k8s::kubectl get svc/"${E2E_RISINGWAVE_NAME}-frontend" -o jsonpath='{.spec.ports[?(@.name=="service")].port}') + test::risingwave::wait_before_compute_registered || return 1 + # shellcheck disable=SC2034 local PSQL_SCRIPT_FILE="${_E2E_RISINGWAVE_TEST_PATH}/query.sql" testenv::util::psql -X -v ON_ERROR_STOP=1 -h "${E2E_RISINGWAVE_NAME}-frontend.${E2E_NAMESPACE}" -p "${frontend_service_port}" -d dev -U root diff --git a/test/e2e/tests/tests.sh b/test/e2e/tests/tests.sh index cd7b44bd..24b4d52a 100644 --- a/test/e2e/tests/tests.sh +++ b/test/e2e/tests/tests.sh @@ -15,7 +15,7 @@ ${__E2E_SOURCE_TESTS_TESTS_SH__:=false} && return 0 || __E2E_SOURCE_TESTS_TESTS_SH__=true export E2E_RISINGWAVE_NAME="${E2E_RISINGWAVE_NAME:=e2e}" -export E2E_RISINGWAVE_IMAGE="${E2E_RISINGWAVE_IMAGE:=risingwavelabs/risingwave:v1.7.3}" +export E2E_RISINGWAVE_IMAGE="${E2E_RISINGWAVE_IMAGE:=risingwavelabs/risingwave:v1.8.2}" source "$(dirname "${BASH_SOURCE[0]}")/risingwave/tests.sh" source "$(dirname "${BASH_SOURCE[0]}")/risingwavescaleview/tests.sh"