From c4d47022108d356a711145de9fe830fc68cc64a0 Mon Sep 17 00:00:00 2001 From: zhuwenxing Date: Wed, 19 Jan 2022 18:59:39 +0800 Subject: [PATCH] [skip e2e]update jenkins file (#15297) * [skip e2e]update jenkins file Signed-off-by: zhuwenxing * [skip e2e]update jenkins file Signed-off-by: zhuwenxing --- build/ci/jenkins/ChaosTest.groovy | 6 +++++- .../deploy/scripts/action_after_reinstall.py | 12 +++++++----- .../deploy/scripts/action_after_upgrade.py | 14 ++++++++------ .../deploy/scripts/action_before_reinstall.py | 14 ++++++++------ .../deploy/scripts/action_before_upgrade.py | 14 ++++++++------ 5 files changed, 36 insertions(+), 24 deletions(-) diff --git a/build/ci/jenkins/ChaosTest.groovy b/build/ci/jenkins/ChaosTest.groovy index bcaf981896..c9eb1e056a 100644 --- a/build/ci/jenkins/ChaosTest.groovy +++ b/build/ci/jenkins/ChaosTest.groovy @@ -32,7 +32,7 @@ pipeline { string( description: 'Image Repository', name: 'image_repository', - defaultValue: 'milvusdb/milvus-dev' + defaultValue: 'harbor.zilliz.cc/dockerhub/milvusdb/milvus-dev' ) string( description: 'Image Tag', @@ -87,6 +87,7 @@ pipeline { } sh "echo ${image_tag_modified}" sh "echo ${params.chaos_type}" + sh "docker pull ${params.image_repository}:${image_tag_modified}" sh "helm repo add milvus https://milvus-io.github.io/milvus-helm" sh "helm repo update" if ("${params.pod_name}" == "standalone"){ @@ -113,6 +114,9 @@ pipeline { } } stage ('Run e2e test before chaos') { + options { + timeout(time: 5, unit: 'MINUTES') // timeout on this stage + } steps { container('main') { dir ('tests/python_client/chaos') { diff --git a/tests/python_client/deploy/scripts/action_after_reinstall.py b/tests/python_client/deploy/scripts/action_after_reinstall.py index b01e6cfcff..08d251f999 100644 --- a/tests/python_client/deploy/scripts/action_after_reinstall.py +++ b/tests/python_client/deploy/scripts/action_after_reinstall.py @@ -2,28 +2,28 @@ from pymilvus import connections from utils import * -def task_1(data_size): +def task_1(data_size, host): """ task_1: before reinstall: create collection and insert data, load and search after reinstall: get collection, load, search, create index, load, and search """ prefix = "task_1_" - connections.connect(host="127.0.0.1", port=19530, timeout=60) + connections.connect(host=host, port=19530, timeout=60) get_collections(prefix) load_and_search(prefix) create_index(prefix) load_and_search(prefix) -def task_2(data_zise): +def task_2(data_zise, host): """ task_2: before reinstall: create collection, insert data and create index, load and search after reinstall: get collection, load, search, insert data, create index, load, and search """ prefix = "task_2_" - connections.connect(host="127.0.0.1", port=19530, timeout=60) + connections.connect(host=host, port=19530, timeout=60) get_collections(prefix) load_and_search(prefix) create_collections_and_insert_data(prefix, data_zise) @@ -34,9 +34,11 @@ def task_2(data_zise): if __name__ == '__main__': import argparse parser = argparse.ArgumentParser(description='config for deploy test') + parser.add_argument('--host', type=str, default="127.0.0.1", help='milvus server ip') parser.add_argument('--data_size', type=int, default=3000, help='data size') args = parser.parse_args() + host = args.host data_size = args.data_size - print(f"data size: {data_size}") + print(f"data size: {data_size}") task_1(data_size) task_2(data_size) \ No newline at end of file diff --git a/tests/python_client/deploy/scripts/action_after_upgrade.py b/tests/python_client/deploy/scripts/action_after_upgrade.py index ae21fcd47b..14678fba7c 100644 --- a/tests/python_client/deploy/scripts/action_after_upgrade.py +++ b/tests/python_client/deploy/scripts/action_after_upgrade.py @@ -2,14 +2,14 @@ from pymilvus import connections from utils import * -def task_1(data_size): +def task_1(data_size, host): """ task_1: before upgrade: create collection and insert data, load and search after upgrade: get collection, load, search, create index, load, and search """ prefix = "task_1_" - connections.connect(host="127.0.0.1", port=19530, timeout=60) + connections.connect(host=host, port=19530, timeout=60) get_collections(prefix) load_and_search(prefix) create_collections_and_insert_data(prefix, data_size) @@ -17,14 +17,14 @@ def task_1(data_size): load_and_search(prefix) -def task_2(data_size): +def task_2(data_size, host): """ task_2: before upgrade: create collection, insert data and create index, load and search after upgrade: get collection, load, search, insert data, create index, load, and search """ prefix = "task_2_" - connections.connect(host="127.0.0.1", port=19530, timeout=60) + connections.connect(host=host, port=19530, timeout=60) get_collections(prefix) load_and_search(prefix) create_collections_and_insert_data(prefix, data_size) @@ -35,9 +35,11 @@ def task_2(data_size): if __name__ == '__main__': import argparse parser = argparse.ArgumentParser(description='config for deploy test') + parser.add_argument('--host', type=str, default="127.0.0.1", help='milvus server ip') parser.add_argument('--data_size', type=int, default=3000, help='data size') args = parser.parse_args() data_size = args.data_size + host = args.host print(f"data size: {data_size}") - task_1(data_size) - task_2(data_size) \ No newline at end of file + task_1(data_size, host) + task_2(data_size, host) \ No newline at end of file diff --git a/tests/python_client/deploy/scripts/action_before_reinstall.py b/tests/python_client/deploy/scripts/action_before_reinstall.py index 46feec50aa..f04c32d6f2 100644 --- a/tests/python_client/deploy/scripts/action_before_reinstall.py +++ b/tests/python_client/deploy/scripts/action_before_reinstall.py @@ -2,28 +2,28 @@ from pymilvus import connections from utils import * -def task_1(data_size): +def task_1(data_size, host): """ task_1: before reinstall: create collection and insert data, load and search after reinstall: get collection, load, search, create index, load, and search """ prefix = "task_1_" - connections.connect(host="127.0.0.1", port=19530, timeout=60) + connections.connect(host=host, port=19530, timeout=60) get_collections(prefix) load_and_search(prefix) create_collections_and_insert_data(prefix,data_size) load_and_search(prefix) -def task_2(data_size): +def task_2(data_size, host): """ task_2: before reinstall: create collection, insert data and create index,load and search after reinstall: get collection, load, search, insert data, create index, load, and search """ prefix = "task_2_" - connections.connect(host="127.0.0.1", port=19530, timeout=60) + connections.connect(host=host, port=19530, timeout=60) get_collections(prefix) load_and_search(prefix) create_collections_and_insert_data(prefix, data_size) @@ -34,9 +34,11 @@ def task_2(data_size): if __name__ == '__main__': import argparse parser = argparse.ArgumentParser(description='config for deploy test') + parser.add_argument('--host', type=str, default="127.0.0.1", help='milvus server ip') parser.add_argument('--data_size', type=int, default=3000, help='data size') args = parser.parse_args() data_size = args.data_size + host = args.host print(f"data_size: {data_size}") - task_1(data_size) - task_2(data_size) + task_1(data_size, host) + task_2(data_size, host) diff --git a/tests/python_client/deploy/scripts/action_before_upgrade.py b/tests/python_client/deploy/scripts/action_before_upgrade.py index 93141f80aa..3612a78667 100644 --- a/tests/python_client/deploy/scripts/action_before_upgrade.py +++ b/tests/python_client/deploy/scripts/action_before_upgrade.py @@ -2,28 +2,28 @@ from pymilvus import connections from utils import * -def task_1(data_size): +def task_1(data_size, host): """ task_1: before upgrade: create collection and insert data, load and search after upgrade: get collection, load, search, create index, load, and search """ prefix = "task_1_" - connections.connect(host="127.0.0.1", port=19530, timeout=60) + connections.connect(host=host, port=19530, timeout=60) get_collections(prefix) load_and_search(prefix) create_collections_and_insert_data(prefix, data_size) load_and_search(prefix) -def task_2(data_size): +def task_2(data_size, host): """ task_2: before upgrade: create collection, insert data and create index, load and search after upgrade: get collection, load, search, insert data, create index, load, and search """ prefix = "task_2_" - connections.connect(host="127.0.0.1", port=19530, timeout=60) + connections.connect(host=host, port=19530, timeout=60) get_collections(prefix) load_and_search(prefix) create_collections_and_insert_data(prefix, data_size) @@ -34,9 +34,11 @@ def task_2(data_size): if __name__ == '__main__': import argparse parser = argparse.ArgumentParser(description='config for deploy test') + parser.add_argument('--host', type=str, default="127.0.0.1", help='milvus server ip') parser.add_argument('--data_size', type=int, default=3000, help='data size') args = parser.parse_args() data_size = args.data_size + host = args.host print(f"data size: {data_size}") - task_1(data_size) - task_2(data_size) + task_1(data_size, host) + task_2(data_size, host)