Skip to content

Commit 61904a5

Browse files
committed
Add colour to CI logs, CNPG version depends on K8s
1 parent 4f809b8 commit 61904a5

File tree

1 file changed

+28
-10
lines changed

1 file changed

+28
-10
lines changed

ci/test.sh

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/bin/bash
22

3-
# Can update when we drop older K8s versions
4-
# CNPG_VERSION=1.28.1
5-
CNPG_VERSION=1.15.1
3+
CNPG_VERSION=1.28.1
4+
5+
f_green="\n\033[32;1m%s\033[0m\n"
6+
f_red="\n\033[31;1m%s\033[0m\n"
67

78
fold_start() {
89
echo "::group::$1"
@@ -15,30 +16,47 @@ fold_end() {
1516
# kubectl seems to frequently loose its connection on Travis, auto-retry once
1617
kubectl_retry() {
1718
kubectl "$@" || {
18-
>&2 echo "kubectl failed, retrying..."
19+
>&2 printf "$f_red" "kubectl failed, retrying..."
1920
sleep 3
2021
kubectl "$@"
2122
}
2223
}
2324

2425
display_logs() {
2526
fold_start "Display kubernetes resources"
26-
echo "***** node *****"
27+
28+
printf "$f_green" "***** node *****"
29+
2730
kubectl_retry describe node
2831
for obj in daemonset deployment statefulset pods service ingress pv pvc events; do
29-
echo "***** $obj *****"
32+
printf "$f_green" "***** $obj *****"
3033
kubectl_retry --namespace $TEST_NAMESPACE get "$obj"
3134
done
32-
echo "***** hub *****"
35+
for crd in cluster; do
36+
printf "$f_green" "***** crd: $crd *****"
37+
kubectl_retry --namespace $TEST_NAMESPACE get "$crd"
38+
done
39+
40+
printf "$f_green" "***** logs: omero-server *****"
3341
kubectl_retry --namespace $TEST_NAMESPACE logs statefulset/omero-server
34-
echo "***** proxy *****"
42+
43+
printf "$f_green" "***** logs: omero-web *****"
3544
kubectl_retry --namespace $TEST_NAMESPACE logs deploy/omero-web
45+
46+
printf "$f_green" "***** logs: cnpg-controller-manager *****"
47+
kubectl_retry --namespace cnpg-system logs deploy/cnpg-controller-manager
48+
3649
fold_end
3750
}
3851

3952
set -eux
4053

4154
fold_start "installing postgresql"
55+
56+
if [ $(kubectl version -ojson | jq -r '.serverVersion | "\(.major).\(.minor)"') == 1.21 ]; then
57+
CNPG_VERSION=1.15.1
58+
fi
59+
4260
IP=$(hostname -I | awk '{print $1}')
4361

4462
TEST_NAMESPACE=omero-test
@@ -72,7 +90,7 @@ until [ "`kubectl_retry -n $TEST_NAMESPACE get statefulset omero-server -o jsonp
7290
kubectl_retry -n $TEST_NAMESPACE get pod
7391
fi
7492
if [ $SECONDS -gt 600 ]; then
75-
echo "Failed to start OMERO.server after $SECONDS s, exiting"
93+
printf "$f_red" "Failed to start OMERO.server after $SECONDS s, exiting"
7694
display_logs
7795
exit 1
7896
fi
@@ -92,7 +110,7 @@ until [ "`kubectl_retry -n $TEST_NAMESPACE get deploy omero-web -o jsonpath='{.s
92110
kubectl_retry -n $TEST_NAMESPACE get pod
93111
fi
94112
if [ $SECONDS -gt 300 ]; then
95-
echo "Failed to start OMERO.web after $SECONDS s, exiting"
113+
printf "$f_red" "Failed to start OMERO.web after $SECONDS s, exiting"
96114
display_logs
97115
exit 1
98116
fi

0 commit comments

Comments
 (0)