Skip to content

Commit 727d265

Browse files
committed
Try to fix CI tests
1 parent de0c63f commit 727d265

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

.github/workflows/test.yml

+12-7
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ jobs:
5454
cfg=`echo "$test" | sed 's/\.py$/.conf/'`
5555
python -m scrapyd_k8s -c scrapyd_k8s.sample-docker.conf -c "$cfg" &
5656
# wait for scrapyd-k8s to become ready
57-
sleep 1; curl --retry 20 --retry-delay 2 --retry-all-errors http://localhost:6800/daemonstatus.json
57+
sleep 1; curl -s --retry 20 --retry-delay 2 --retry-all-errors http://localhost:6800/daemonstatus.json
5858
# run test
5959
pytest -vv --color=yes "$test"
6060
# stop scrapyd-k8s again
61-
kill %1
61+
kill %1; wait %1
6262
done
6363
6464
test-manifest:
@@ -131,14 +131,16 @@ jobs:
131131
# setup for in-cluster k8s
132132
# for each integration test file
133133
for test in scrapyd_k8s/tests/integration/test_*.py; do
134-
echo; echo "# $test"
134+
echo -e "\033[31;1;4m"; echo -n "# $test"; echo "\033[0m"
135135
# run scrapyd-k8s with test-specific configuration file
136136
cfg=`echo "$test" | sed 's/\.py$/.conf/'`
137137
kubectl create cm scrapyd-k8s-testcfg --from-file=scrapyd_k8s.test.conf="$cfg"
138138
kubectl scale --replicas=1 deploy/scrapyd-k8s
139+
sleep 1; kubectl describe pod # debug
140+
sleep 5; kubectl describe pod # debug
139141
# wait for scrapyd-k8s to become ready
140142
kubectl wait --for=condition=Available deploy/scrapyd-k8s --timeout=60s
141-
curl --retry 10 --retry-delay 2 --retry-all-errors `minikube service scrapyd-k8s --url`/daemonstatus.json
143+
curl -s --retry 10 --retry-delay 2 --retry-all-errors `minikube service scrapyd-k8s --url`/daemonstatus.json
142144
# run test
143145
TEST_WITH_K8S=1 \
144146
TEST_BASE_URL=`minikube service scrapyd-k8s --url` \
@@ -147,7 +149,10 @@ jobs:
147149
pytest -vv --color=yes "$test"
148150
# stop scrapyd-k8s and delete test-specific configmap
149151
kubectl scale --replicas=0 deploy/scrapyd-k8s
150-
kubectl delete cm scrapyd-k8s-testcfg
152+
sleep 1; kubectl describe pod # debug
153+
sleep 5; kubectl describe pod # debug
154+
kubectl wait --for='condition=!Available' deploy/scrapyd-k8s --timeout=60s
155+
kubectl delete cm scrapyd-k8s-testcfg --wait
151156
done
152157
153158
test-k8s:
@@ -187,12 +192,12 @@ jobs:
187192
[ -e "$cfg" ] || cfg=/dev/null
188193
python -m scrapyd_k8s -c scrapyd_k8s.sample-k8s.conf -c "$cfg" &
189194
# wait for scrapyd-k8s to become ready
190-
sleep 1; curl --retry 20 --retry-delay 2 --retry-all-errors http://localhost:6800/daemonstatus.json
195+
sleep 1; curl -s --retry 20 --retry-delay 2 --retry-all-errors http://localhost:6800/daemonstatus.json
191196
# run test
192197
TEST_WITH_K8S=1 \
193198
TEST_MAX_WAIT=60 \
194199
TEST_AVAILABLE_VERSIONS=latest,`skopeo list-tags docker://ghcr.io/q-m/scrapyd-k8s-spider-example | jq -r '.Tags | map(select(. != "latest" and (startswith("sha-") | not))) | join(",")'` \
195200
pytest -vv --color=yes "$test"
196201
# stop scrapyd-k8s again
197-
kill %1
202+
kill %1; wait %1
198203
done

0 commit comments

Comments
 (0)