@@ -54,11 +54,11 @@ jobs:
54
54
cfg=`echo "$test" | sed 's/\.py$/.conf/'`
55
55
python -m scrapyd_k8s -c scrapyd_k8s.sample-docker.conf -c "$cfg" &
56
56
# 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
58
58
# run test
59
59
pytest -vv --color=yes "$test"
60
60
# stop scrapyd-k8s again
61
- kill %1
61
+ kill %1; wait %1
62
62
done
63
63
64
64
test-manifest :
@@ -131,14 +131,16 @@ jobs:
131
131
# setup for in-cluster k8s
132
132
# for each integration test file
133
133
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 "
135
135
# run scrapyd-k8s with test-specific configuration file
136
136
cfg=`echo "$test" | sed 's/\.py$/.conf/'`
137
137
kubectl create cm scrapyd-k8s-testcfg --from-file=scrapyd_k8s.test.conf="$cfg"
138
138
kubectl scale --replicas=1 deploy/scrapyd-k8s
139
+ sleep 1; kubectl describe pod # debug
140
+ sleep 5; kubectl describe pod # debug
139
141
# wait for scrapyd-k8s to become ready
140
142
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
142
144
# run test
143
145
TEST_WITH_K8S=1 \
144
146
TEST_BASE_URL=`minikube service scrapyd-k8s --url` \
@@ -147,7 +149,10 @@ jobs:
147
149
pytest -vv --color=yes "$test"
148
150
# stop scrapyd-k8s and delete test-specific configmap
149
151
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
151
156
done
152
157
153
158
test-k8s :
@@ -187,12 +192,12 @@ jobs:
187
192
[ -e "$cfg" ] || cfg=/dev/null
188
193
python -m scrapyd_k8s -c scrapyd_k8s.sample-k8s.conf -c "$cfg" &
189
194
# 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
191
196
# run test
192
197
TEST_WITH_K8S=1 \
193
198
TEST_MAX_WAIT=60 \
194
199
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(",")'` \
195
200
pytest -vv --color=yes "$test"
196
201
# stop scrapyd-k8s again
197
- kill %1
202
+ kill %1; wait %1
198
203
done
0 commit comments