diff --git a/hack/OWNERS b/hack/OWNERS new file mode 100644 index 000000000..c6b629db9 --- /dev/null +++ b/hack/OWNERS @@ -0,0 +1,6 @@ +approvers: + - wuyingjun-lucky + - duanmengkk +reviewers: + - wuyingjun-lucky + - duanmengkk diff --git a/hack/rune2e.sh b/hack/rune2e.sh index 227fb7725..0d97941aa 100755 --- a/hack/rune2e.sh +++ b/hack/rune2e.sh @@ -32,8 +32,8 @@ util::wait_for_condition "mcs of member2 are ready" \ nginx_service_ip=$(kubectl -n kosmos-e2e get svc nginx-service -o=jsonpath='{.spec.clusterIP}') -# e2e test for access nginx service -#docker exec -it ${HOST_CLUSTER_NAME}-control-plane sh -c "curl -sSf -m 5 ${nginx_service_ip}:80" && echo "success" || { echo "fail"; exit 1; } +# e2e test for access nginx service, should wait for cluster-link-agent is worked firstly +sleep 100 && docker exec -it ${HOST_CLUSTER_NAME}-control-plane sh -c "curl -sSf -m 5 ${nginx_service_ip}:80" && echo "success" || { echo "fail"; exit 1; } # e2e for mysql-operator kubectl --context="kind-cluster-host" apply -f "${ROOT}"/../test/e2e/deploy/mysql-operator @@ -41,12 +41,10 @@ util::wait_for_condition "mysql operator are ready" \ "kubectl --context=kind-${HOST_CLUSTER_NAME} get pods -n mysql-operator mysql-operator-0 | awk 'NR>1 {if (\$3 == \"Running\") exit 0; else exit 1; }'" \ 300 -#kubectl --context="kind-cluster-host" exec -it /bin/sh -c kubectl --context="kind-${HOST_CLUSTER_NAME}" apply -f "${ROOT}"/../test/e2e/deploy/cr - -#util::wait_for_condition "mysql cr are ready" \ -# "[ \$(kubectl get pods -n kosmos-e2e --field-selector=status.phase=Running --no-headers | wc -l) -eq 2 ]" \ -# 1200 +util::wait_for_condition "mysql cr are ready" \ + "[ \$(kubectl get pods -n kosmos-e2e --field-selector=status.phase=Running --no-headers | wc -l) -eq 2 ]" \ + 1200 echo "E2e test of mysql-operator success" diff --git a/test/OWNERS b/test/OWNERS new file mode 100644 index 000000000..c6b629db9 --- /dev/null +++ b/test/OWNERS @@ -0,0 +1,6 @@ +approvers: + - wuyingjun-lucky + - duanmengkk +reviewers: + - wuyingjun-lucky + - duanmengkk