Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

maint: Make smoke tests more reliable #321

Merged
merged 8 commits into from
Dec 1, 2023
Merged

maint: Make smoke tests more reliable #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3fdf65e
wait longer for rollouts to complete
MikeGoldsmith Nov 30, 2023
94ad2bd
reduce number of echoservers from 5 to 1
MikeGoldsmith Nov 30, 2023
e912121
attempt to get collector output file a few times
MikeGoldsmith Nov 30, 2023
47cf2a8
move delay to begining of loop
MikeGoldsmith Nov 30, 2023
29e5195
use -s to check if the file is empty
MikeGoldsmith Nov 30, 2023
69b1eab
add logs
MikeGoldsmith Nov 30, 2023
7127e27
remove loop and wait longer
MikeGoldsmith Nov 30, 2023
6638611
update comment to be more accurate about waiting
MikeGoldsmith Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,21 @@ smokey_agent_install: $(maybe_docker_build)
helm repo add honeycomb https://honeycombio.github.io/helm-charts
OTEL_COLLECTOR_IP="$(call get_collector_ip)" \
envsubst < smoke-tests/agent-helm-values.yaml | helm install smokey-agent honeycomb/network-agent --values -
kubectl rollout status daemonset.apps/smokey-agent-network-agent --timeout=10s
kubectl rollout status daemonset.apps/smokey-agent-network-agent --timeout=60s

smokey_copy_output:
# copy output from collector file to local machine
# this is ignored in .gitignore
# TODO use more reliable way to wait for file to be ready
# for now just sleeping a bit
sleep 12
kubectl cp -c filecp default/smokey-collector-opentelemetry-collector-0:/tmp/trace.json ./smoke-tests/traces-orig.json
# removes the file first in case it already exists
if [ -f ./smoke-tests/traces-orig.json ]; then \
rm ./smoke-tests/traces-orig.json; \
fi
# copy collector output file to local machine to run tests on
# the file may not be ready immediately, so wait before trying to copy
# note: the file is ignored in .gitignore
sleep 30
kubectl cp -c filecp default/smokey-collector-opentelemetry-collector-0:/tmp/trace.json ./smoke-tests/traces-orig.json; \
if [ ! -s ./smoke-tests/traces-orig.json ]; then \
echo "failed to copy collector output file"; \
fi;

smokey_verify_output:
# verify that the output from the collector matches the expected output
Expand All @@ -69,7 +75,7 @@ get_collector_ip = \
smokey_echo_job:
make apply-echoserver
kubectl create --filename smoke-tests/smoke-job.yaml
kubectl rollout status deployment.apps/echoserver --timeout=10s --namespace echoserver
kubectl rollout status deployment.apps/echoserver --timeout=60s --namespace echoserver
kubectl wait --for=condition=complete job/smoke-job --timeout=60s --namespace echoserver

.PHONY: unsmoke
Expand Down
2 changes: 1 addition & 1 deletion smoke-tests/echoserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
name: echoserver
namespace: echoserver
spec:
replicas: 5
replicas: 1
selector:
matchLabels:
app: echoserver
Expand Down