From 3ccc91532e9f5d77e06558b31236ab2a4328fb96 Mon Sep 17 00:00:00 2001 From: zhuwenxing Date: Wed, 1 Jun 2022 17:32:02 +0800 Subject: [PATCH] [skip e2e]Add information of etcd to logs in chaos and deploy test (#17299) Signed-off-by: zhuwenxing --- build/ci/jenkins/ChaosTest.groovy | 12 ++++++------ build/ci/jenkins/ChaosTestKafkaMQ.groovy | 2 +- build/ci/jenkins/DeployTest.groovy | 6 +++--- tests/scripts/export_log_k8s.sh | 11 +++++++++++ 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/build/ci/jenkins/ChaosTest.groovy b/build/ci/jenkins/ChaosTest.groovy index 5bb75ff51..a91517c9b 100644 --- a/build/ci/jenkins/ChaosTest.groovy +++ b/build/ci/jenkins/ChaosTest.groovy @@ -141,7 +141,7 @@ pipeline { } sh "kubectl wait --for=condition=Ready pod -l app.kubernetes.io/instance=${env.RELEASE_NAME} -n ${env.NAMESPACE} --timeout=360s" sh "kubectl wait --for=condition=Ready pod -l release=${env.RELEASE_NAME} -n ${env.NAMESPACE} --timeout=360s" - sh "kubectl get pods|grep ${env.RELEASE_NAME}" + sh "kubectl get pods -o wide|grep ${env.RELEASE_NAME}" } } } @@ -208,7 +208,7 @@ pipeline { echo "chaos test done" sh "kubectl wait --for=condition=Ready pod -l app.kubernetes.io/instance=${env.RELEASE_NAME} -n ${env.NAMESPACE} --timeout=360s" sh "kubectl wait --for=condition=Ready pod -l release=${env.RELEASE_NAME} -n ${env.NAMESPACE} --timeout=360s" - sh "kubectl get pods|grep ${env.RELEASE_NAME}" + sh "kubectl get pods -o wide|grep ${env.RELEASE_NAME}" } } } @@ -238,7 +238,7 @@ pipeline { script { def host = sh(returnStdout: true, script: "kubectl get svc/${env.RELEASE_NAME}-milvus -o jsonpath=\"{.spec.clusterIP}\"").trim() sh "pytest -s -v ../testcases/test_e2e.py --host $host --log-cli-level=INFO --capture=no" - sh "kubectl get pods|grep ${env.RELEASE_NAME}" + sh "kubectl get pods -o wide|grep ${env.RELEASE_NAME}" } } } @@ -256,7 +256,7 @@ pipeline { script { def host = sh(returnStdout: true, script: "kubectl get svc/${env.RELEASE_NAME}-milvus -o jsonpath=\"{.spec.clusterIP}\"").trim() sh "python3 scripts/hello_milvus.py --host $host" - sh "kubectl get pods|grep ${env.RELEASE_NAME}" + sh "kubectl get pods -o wide|grep ${env.RELEASE_NAME}" } } } @@ -272,7 +272,7 @@ pipeline { script { def host = sh(returnStdout: true, script: "kubectl get svc/${env.RELEASE_NAME}-milvus -o jsonpath=\"{.spec.clusterIP}\"").trim() sh "python3 scripts/verify_all_collections.py --host $host" - sh "kubectl get pods|grep ${env.RELEASE_NAME}" + sh "kubectl get pods -o wide|grep ${env.RELEASE_NAME}" } } } @@ -286,7 +286,7 @@ pipeline { dir ('tests/python_client/chaos') { script { echo "get pod status" - sh "kubectl get pods|grep ${env.RELEASE_NAME} || true" + sh "kubectl get pods -o wide|grep ${env.RELEASE_NAME} || true" echo "collecte logs" sh "bash ../../scripts/export_log_k8s.sh ${env.NAMESPACE} ${env.RELEASE_NAME} k8s_log/${env.RELEASE_NAME} || true" sh "tar -zcvf artifacts-${env.RELEASE_NAME}-pytest-logs.tar.gz /tmp/ci_logs/ --remove-files || true" diff --git a/build/ci/jenkins/ChaosTestKafkaMQ.groovy b/build/ci/jenkins/ChaosTestKafkaMQ.groovy index 6e7ec53eb..7e96d49e5 100644 --- a/build/ci/jenkins/ChaosTestKafkaMQ.groovy +++ b/build/ci/jenkins/ChaosTestKafkaMQ.groovy @@ -121,7 +121,7 @@ pipeline { } sh "kubectl wait --for=condition=Ready pod -l app.kubernetes.io/instance=${env.RELEASE_NAME} -n ${env.NAMESPACE} --timeout=360s" sh "kubectl wait --for=condition=Ready pod -l release=${env.RELEASE_NAME} -n ${env.NAMESPACE} --timeout=360s" - sh "kubectl get pods -o wide -o wide|grep ${env.RELEASE_NAME}" + sh "kubectl get pods -o wide|grep ${env.RELEASE_NAME}" } } } diff --git a/build/ci/jenkins/DeployTest.groovy b/build/ci/jenkins/DeployTest.groovy index 9bf075823..b45a845c9 100644 --- a/build/ci/jenkins/DeployTest.groovy +++ b/build/ci/jenkins/DeployTest.groovy @@ -176,7 +176,7 @@ pipeline { } sh "kubectl wait --for=condition=Ready pod -l app.kubernetes.io/instance=${env.RELEASE_NAME} -n ${env.NAMESPACE} --timeout=360s" sh "kubectl wait --for=condition=Ready pod -l release=${env.RELEASE_NAME} -n ${env.NAMESPACE} --timeout=360s" - sh "kubectl get pods|grep ${env.RELEASE_NAME}" + sh "kubectl get pods -o wide|grep ${env.RELEASE_NAME}" } } } @@ -266,7 +266,7 @@ pipeline { } sh "kubectl wait --for=condition=Ready pod -l app.kubernetes.io/instance=${env.RELEASE_NAME} -n ${env.NAMESPACE} --timeout=360s" sh "kubectl wait --for=condition=Ready pod -l release=${env.RELEASE_NAME} -n ${env.NAMESPACE} --timeout=360s" - sh "kubectl get pods|grep ${env.RELEASE_NAME}" + sh "kubectl get pods -o wide|grep ${env.RELEASE_NAME}" } } } @@ -303,7 +303,7 @@ pipeline { dir ('tests/python_client/chaos') { script { echo "get pod status" - sh "kubectl get pods|grep ${env.RELEASE_NAME} || true" + sh "kubectl get pods -o wide|grep ${env.RELEASE_NAME} || true" echo "collecte logs" sh "bash ../../scripts/export_log_k8s.sh ${env.NAMESPACE} ${env.RELEASE_NAME} k8s_log/${env.RELEASE_NAME} || echo 'export log failed'" echo "upload logs" diff --git a/tests/scripts/export_log_k8s.sh b/tests/scripts/export_log_k8s.sh index fa2308cd2..291219994 100755 --- a/tests/scripts/export_log_k8s.sh +++ b/tests/scripts/export_log_k8s.sh @@ -6,6 +6,17 @@ set -e ns_name=$1 prefix_name=$2 log_dir=${3:-"k8s_logs"} + +array=($(kubectl get pod -n ${ns_name} -l "app.kubernetes.io/name=etcd" | grep ${prefix_name} | awk '{print $1}')) +echo ${array[@]} +mkdir -p $log_dir/etcd_session +for pod in ${array[*]} +do +echo "check session for etcd pod $pod " +kubectl exec $pod -n ${ns_name} -- etcdctl get --prefix by-dev/meta/session > ./$log_dir/etcd_session/$pod.log || echo "export session for pod $pod failed" +done +echo "check session done" + array=($(kubectl get pod -n ${ns_name}|grep ${prefix_name}|awk '{print $1}')) echo ${array[@]} if [ ! -d $log_dir/pod_log ] || [ ! -d $log_dir/pod_describe ]; -- GitLab