github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-08-18 12:06:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feat: revert ci to kind (#6035)

Browse Source 
* Feat: revert ci to kind

Signed-off-by: Somefive <yd219913@alibaba-inc.com>

* feat: use internal runner

Signed-off-by: Somefive <yd219913@alibaba-inc.com>

* fix test bug

Signed-off-by: Somefive <yd219913@alibaba-inc.com>

---------

Signed-off-by: Somefive <yd219913@alibaba-inc.com>
This commit is contained in:
Somefive
2023-05-25 17:49:44 +08:00
committed by GitHub
parent ef4bb07fb3
commit 2298dd73dc
13 changed files with 65 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hack/e2e/end_e2e.sh
+6 -5
View File
@@ -1,20 +1,21 @@
. ./hack/e2e/end_e2e_core.sh
OAM_CONTAINER_ID=$(docker exec k3d-k3s-default-server-0 crictl ps | grep oam-runtime | grep --regexp '^.............' -o)
OAM_DOCKER_DIR=$(docker exec k3d-k3s-default-server-0 crictl inspect --output go-template --template '{{range .info.runtimeSpec.mounts}}{{if (eq .destination "/workspace/data")}}{{.source}}{{end}}{{end}}' "${OAM_CONTAINER_ID}")
DOCKER_CONTAINER=kind-control-plane
OAM_CONTAINER_ID=$(docker exec $DOCKER_CONTAINER crictl ps | grep oam-runtime | grep --regexp '^.............' -o)
OAM_DOCKER_DIR=$(docker exec $DOCKER_CONTAINER crictl inspect --output go-template --template '{{range .info.runtimeSpec.mounts}}{{if (eq .destination "/workspace/data")}}{{.source}}{{end}}{{end}}' "${OAM_CONTAINER_ID}")
echo "${OAM_CONTAINER_ID}"
echo "${OAM_DOCKER_DIR}"
docker exec k3d-k3s-default-server-0 crictl exec "${OAM_CONTAINER_ID}" kill -2 1
docker exec $DOCKER_CONTAINER crictl exec "${OAM_CONTAINER_ID}" kill -2 1
file=$OAM_DOCKER_DIR/e2e-profile.out
echo "$file"
n=1
while [ $n -le 60 ];do
if_exist=$(docker exec k3d-k3s-default-server-0 sh -c "test -f $file && echo 'ok'")
if_exist=$(docker exec $DOCKER_CONTAINER sh -c "test -f $file && echo 'ok'")
echo "$if_exist"
if [ -n "$if_exist" ];then
docker exec k3d-k3s-default-server-0 cat "$file" > /tmp/oam-e2e-profile.out
docker exec $DOCKER_CONTAINER cat "$file" > /tmp/oam-e2e-profile.out
break
fi
echo file not generated yet
hack/e2e/end_e2e_core.sh
+6 -5
View File
@@ -1,19 +1,20 @@
CORE_NAME="${CORE_NAME:-kubevela}"
CONTAINER_ID=$(docker exec k3d-k3s-default-server-0 crictl ps | grep $CORE_NAME'\s' | grep --regexp '^.............' -o)
DOCKER_DIR=$(docker exec k3d-k3s-default-server-0 crictl inspect --output go-template --template '{{range .info.runtimeSpec.mounts}}{{if (eq .destination "/workspace/data")}}{{.source}}{{end}}{{end}}' "${CONTAINER_ID}")
DOCKER_CONTAINER=kind-control-plane
CONTAINER_ID=$(docker exec $DOCKER_CONTAINER crictl ps | grep $CORE_NAME'\s' | grep --regexp '^.............' -o)
DOCKER_DIR=$(docker exec $DOCKER_CONTAINER crictl inspect --output go-template --template '{{range .info.runtimeSpec.mounts}}{{if (eq .destination "/workspace/data")}}{{.source}}{{end}}{{end}}' "${CONTAINER_ID}")
echo "${CONTAINER_ID}"
echo "${DOCKER_DIR}"
docker exec k3d-k3s-default-server-0 crictl exec "${CONTAINER_ID}" kill -2 1
docker exec $DOCKER_CONTAINER crictl exec "${CONTAINER_ID}" kill -2 1
file=$DOCKER_DIR/e2e-profile.out
echo "$file"
n=1
while [ $n -le 60 ];do
if_exist=$(docker exec k3d-k3s-default-server-0 sh -c "test -f $file && echo 'ok'")
if_exist=$(docker exec $DOCKER_CONTAINER sh -c "test -f $file && echo 'ok'")
echo "$if_exist"
if [ -n "$if_exist" ];then
docker exec k3d-k3s-default-server-0 cat "$file" >> /tmp/e2e-profile.out
docker exec $DOCKER_CONTAINER cat "$file" >> /tmp/e2e-profile.out
break
fi
echo file not generated yet