diff --git a/.github/workflows/deploy-test.yaml b/.github/workflows/deploy-test.yaml index 82b3073864..5ce8d4bb20 100644 --- a/.github/workflows/deploy-test.yaml +++ b/.github/workflows/deploy-test.yaml @@ -131,11 +131,11 @@ jobs: # if the task is upgrade, install milvus with latest rc image in repo milvusdb/milvus if [ ${{ matrix.task }} == "upgrade" ] && [ ${{ matrix.mode }} == "cluster" ]; then echo "task: ${{ matrix.task }} mode: ${{ matrix.mode }}"; - helm install --wait --timeout 720s deploy-testing milvus/milvus --set image.all.tag=master-20211225-6177d46 -f cluster-values.yaml; + helm install --wait --timeout 720s deploy-testing milvus/milvus --set image.all.tag=master-20220125-6336e232 -f cluster-values.yaml; fi if [ ${{ matrix.task }} == "upgrade" ] && [ ${{ matrix.mode }} == "standalone" ]; then echo "task: ${{ matrix.task }} mode: ${{ matrix.mode }}"; - helm install --wait --timeout 720s deploy-testing milvus/milvus --set image.all.tag=master-20211225-6177d46 -f standalone-values.yaml; + helm install --wait --timeout 720s deploy-testing milvus/milvus --set image.all.tag=master-20220125-6336e232 -f standalone-values.yaml; fi kubectl get pods diff --git a/tests/python_client/chaos/cluster-values.yaml b/tests/python_client/chaos/cluster-values.yaml index bc147961c0..0767ba3e15 100644 --- a/tests/python_client/chaos/cluster-values.yaml +++ b/tests/python_client/chaos/cluster-values.yaml @@ -41,7 +41,7 @@ pulsar: cpu: 0.2 memory: 512Mi configData: - BOOKIE_MEM: "\"-Xms512m -Xmx512m -XX:MaxDirectMemorySize=512m -Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024 -XX:+UseG1GC -XX:MaxGCPauseMillis=10 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintHeapAtGC -verbosegc -XX:G1LogLevel=finest\"" + BOOKIE_MEM: "\"-Xms512m -Xmx512m -XX:MaxDirectMemorySize=512m -Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024 -XX:+UseG1GC -XX:MaxGCPauseMillis=10 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem -verbosegc\"" zookeeper: replicaCount: 1 resources: @@ -49,7 +49,7 @@ pulsar: cpu: 0.1 memory: 256Mi configData: - PULSAR_MEM: "\"-Xms256m -Xmx256m -Dcom.sun.management.jmxremote -Djute.maxbuffer=10485760 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:+DisableExplicitGC -XX:+PerfDisableSharedMem -Dzookeeper.forceSync=no\"" + PULSAR_MEM: "\"-Xms512m -Xmx512m -Dcom.sun.management.jmxremote -Djute.maxbuffer=10485760 -XX:+DoEscapeAnalysis -XX:+DisableExplicitGC -XX:+PerfDisableSharedMem -Dzookeeper.forceSync=no\"" broker: replicaCount: 1 resources: diff --git a/tests/python_client/deploy/cluster-values.yaml b/tests/python_client/deploy/cluster-values.yaml index ee51b8787e..0767ba3e15 100644 --- a/tests/python_client/deploy/cluster-values.yaml +++ b/tests/python_client/deploy/cluster-values.yaml @@ -5,6 +5,7 @@ image: repository: milvusdb/milvus-dev tag: master-latest pullPolicy: IfNotPresent + etcd: replicaCount: 1 minio: @@ -40,7 +41,7 @@ pulsar: cpu: 0.2 memory: 512Mi configData: - BOOKIE_MEM: "\"-Xms512m -Xmx512m -XX:MaxDirectMemorySize=512m -Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024 -XX:+UseG1GC -XX:MaxGCPauseMillis=10 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintHeapAtGC -verbosegc -XX:G1LogLevel=finest\"" + BOOKIE_MEM: "\"-Xms512m -Xmx512m -XX:MaxDirectMemorySize=512m -Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024 -XX:+UseG1GC -XX:MaxGCPauseMillis=10 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem -verbosegc\"" zookeeper: replicaCount: 1 resources: @@ -48,7 +49,7 @@ pulsar: cpu: 0.1 memory: 256Mi configData: - PULSAR_MEM: "\"-Xms256m -Xmx256m -Dcom.sun.management.jmxremote -Djute.maxbuffer=10485760 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:+DisableExplicitGC -XX:+PerfDisableSharedMem -Dzookeeper.forceSync=no\"" + PULSAR_MEM: "\"-Xms512m -Xmx512m -Dcom.sun.management.jmxremote -Djute.maxbuffer=10485760 -XX:+DoEscapeAnalysis -XX:+DisableExplicitGC -XX:+PerfDisableSharedMem -Dzookeeper.forceSync=no\"" broker: replicaCount: 1 resources: diff --git a/tests/python_client/deploy/test.sh b/tests/python_client/deploy/test.sh index 11b9d139ba..288addc1de 100644 --- a/tests/python_client/deploy/test.sh +++ b/tests/python_client/deploy/test.sh @@ -28,7 +28,7 @@ echo "platform: $platform" Task="reinstall" Mode="standalone" -Release="v2.0.0-pre-ga" +Release="v2.0.0" while getopts "hm:t:p:" OPT; do case $OPT in @@ -120,12 +120,12 @@ python scripts/get_tag.py latest_tag=$(jq -r ".latest_tag" tag_info.json) latest_rc_tag=$(jq -r ".latest_rc_tag" tag_info.json) -release_version="v2.0.0-pre-ga" +release_version="v2.0.0" echo $release_version pushd ${Deploy_Dir} # download docker-compose.yml -wget https://github.com/milvus-io/milvus/releases/download/${release_version}/milvus-${Deploy_Dir}-docker-compose.yml -O docker-compose.yml +wget https://github.com/milvus-io/milvus/releases/download/${release_version}/milvus-${Mode}-docker-compose.yml -O docker-compose.yml ls # clean env to deploy a fresh milvus docker-compose down @@ -135,14 +135,15 @@ echo "$pw"| sudo -S rm -rf ./volumes # first deployment if [ "$Task" == "reinstall" ]; then + printf "download latest milvus docker-compose yaml file from github\n" + wget https://raw.githubusercontent.com/milvus-io/milvus/master/deployments/docker/${Mode}/docker-compose.yml -O docker-compose.yml printf "start to deploy latest rc tag milvus\n" replace_image_tag $latest_tag - fi if [ "$Task" == "upgrade" ]; then printf "start to deploy previous rc tag milvus\n" - replace_image_tag "master-20211225-6177d46" # replace previous rc tag with master-20211225-6177d46 + replace_image_tag "master-20220125-6336e232" # replace previous rc tag fi cat docker-compose.yml|grep milvusdb @@ -182,6 +183,9 @@ if [ "$Task" == "upgrade" ]; then printf "start to upgrade milvus\n" # because the task is upgrade, so replace image tag to latest, like rc4-->rc5 + printf "download latest milvus docker-compose yaml file from github\n" + wget https://raw.githubusercontent.com/milvus-io/milvus/master/deployments/docker/${Mode}/docker-compose.yml -O docker-compose.yml + printf "start to deploy latest rc tag milvus\n" replace_image_tag $latest_tag fi