Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add e2e enhancements

Browse Source
This commit is contained in:
Erik Wilson 2019-05-03 11:35:58 -07:00
parent b0e4228609
commit be7acee3c6
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
scripts/sonobuoy
View File

@ -40,10 +40,15 @@ cleanup() {
exit_status=$? exit_status=$?
set +e set +e
echo "Cleaning up" echo "Cleaning up"
docker logs ${K3S_SERVER} >${OUTPUT}/k3s-server.log 2>&1 for container in ${K3S_SERVER} ${K3S_AGENT}; do
docker logs ${K3S_AGENT} >${OUTPUT}/k3s-agent.log 2>&1 docker cp ${container}:/var/lib/rancher/k3s/agent/containerd/containerd.log ${OUTPUT}/${container}-containerd.log
docker rm -f ${K3S_SERVER} 2>/dev/null docker logs ${container} >${OUTPUT}/${container}.log 2>&1
docker rm -f ${K3S_AGENT} 2>/dev/null docker rm -f ${container} 2>/dev/null
if [ ${exit_status} -ne 0 ]; then
cat ${OUTPUT}/${container}-containerd.log
cat ${OUTPUT}/${container}.log
fi
done
rm ${KUBECONFIG} rm ${KUBECONFIG}
exit ${exit_status} exit ${exit_status}
} }
@ -61,23 +66,13 @@ echo "Started ${K3S_SERVER} @ ${K3S_IP}:${K3S_PORT}"
# --- # ---
docker run -d --name ${K3S_AGENT} --privileged \
-e K3S_CLUSTER_SECRET=${SECRET} \
-e K3S_URL=https://${K3S_IP}:${K3S_PORT} \
${K3S_IMAGE} agent
echo "Started ${K3S_AGENT}"
# ---
fetch-kubeconfig() { fetch-kubeconfig() {
docker exec ${K3S_SERVER} cat /etc/rancher/k3s/k3s.yaml 2>/dev/null \ docker cp ${K3S_SERVER}:/etc/rancher/k3s/k3s.yaml ${KUBECONFIG} 2>/dev/null
| tee ${KUBECONFIG}
} }
export -f fetch-kubeconfig export -f fetch-kubeconfig
wait-for-kubeconfig() { wait-for-kubeconfig() {
while [[ -z "$(fetch-kubeconfig)" ]]; do while ! fetch-kubeconfig; do
echo "Waiting for kubeconfig to become available..." echo "Waiting for kubeconfig to become available..."
sleep 5 sleep 5
done done
@ -88,6 +83,15 @@ timeout --foreground 1m bash -c wait-for-kubeconfig
# --- # ---
docker run -d --name ${K3S_AGENT} --privileged \
-e K3S_CLUSTER_SECRET=${SECRET} \
-e K3S_URL=https://${K3S_IP}:${K3S_PORT} \
${K3S_IMAGE} agent
echo "Started ${K3S_AGENT}"
# ---
count-ready-nodes() { count-ready-nodes() {
kubectl get nodes -o json \ kubectl get nodes -o json \
| jq '.items[].status.conditions[] | select(.type == "Ready" and .status == "True") | .type' \ | jq '.items[].status.conditions[] | select(.type == "Ready" and .status == "True") | .type' \
@ -143,7 +147,9 @@ sonobuoy retrieve ${OUTPUT}
tar xzf *_sonobuoy_*.tar.gz tar xzf *_sonobuoy_*.tar.gz
results="./plugins/e2e/results/e2e.log" results="./plugins/e2e/results/e2e.log"
[ -s ${results} ] || exit 1 [ -s ${results} ] || exit 1
tail -20 ${results}
status=$(tail -5 ${results} | grep '^SUCCESS!.*| 0 Failed |' >/dev/null && echo passed || echo failed)
if [ -n "${E2E_LOG_OUTPUT}" ]; then if [ -n "${E2E_LOG_OUTPUT}" ]; then
cp ${results} ${E2E_LOG_OUTPUT} cp ${results} $(echo ${E2E_LOG_OUTPUT} | sed -e "s/-STATUS-/-${status}-/g")
fi fi
) )

13
scripts/sonobuoy-e2e-tests
View File

@ -23,24 +23,19 @@ run-sonobuoy() {
pids+=($!) pids+=($!)
} }
log_output=${OUTPUT}/e2e-${ARCH}-serial.log \ log_output=${OUTPUT}/e2e-STATUS-${ARCH}-serial.log \
run-sonobuoy --e2e-focus='\[Serial\].*\[Conformance\]' run-sonobuoy --e2e-focus='\[Serial\].*\[Conformance\]'
log_output=${OUTPUT}/e2e-${ARCH}-parallel.log \ log_output=${OUTPUT}/e2e-STATUS-${ARCH}-parallel.log \
run-sonobuoy --e2e-focus='\[Conformance\]' --e2e-skip='\[Serial\]' --e2e-parallel=y run-sonobuoy --e2e-focus='\[Conformance\]' --e2e-skip='\[Serial\]' --e2e-parallel=y
cleanup() { cleanup() {
exit_status=$? exit_status=$?
set +e set +e
echo "Killing the tests!" echo "Waiting on the tests!"
kill ${pids[@]} wait
wait ${pids[@]}
exit ${exit_status} exit ${exit_status}
} }
trap cleanup EXIT trap cleanup EXIT
wait ${pids[@]} wait ${pids[@]}
trap - EXIT trap - EXIT
for log in ${output[@]}; do
tail -20 ${log}
done