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.

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

Extend e2e queue timings / Disable testing on Autopilot 1.26 #3059

Merged
merged 2 commits into from
Apr 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 2 additions & 19 deletions build/e2e-image/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,5 @@ fi
gcloud container clusters get-credentials $TEST_CLUSTER_NAME \
--zone=${TEST_CLUSTER_LOCATION} --project=agones-images

# TODO: Here we're using the presence of consul to dictate whether we use consul
# port forwarding or whether we rely on Cloud Build serialization from #2932. This
# allows us to quickly recover (by reinstalling consul) if something breaks.
# After a few more days of PRs, it should be safe to remove this.
if kubectl get statefulset/consul-consul-server -oname >& /dev/null
then
echo "Using legacy consul locking"
kubectl port-forward statefulset/consul-consul-server 8500:8500 &
echo "Waiting consul port-forward to launch on 8500..."
timeout 60 bash -c 'until printf "" 2>>/dev/null >>/dev/tcp/$0/$1; do sleep 1; done' 127.0.0.1 8500
echo "consul port-forward launched. Starting e2e tests..."
echo "consul lock -child-exit-code=true -timeout 90m -verbose LockE2E '/root/e2e.sh "$FEATURES" "$CLOUD_PRODUCT" "$REGISTRY"'"
consul lock -child-exit-code=true -timeout 90m -verbose LockE2E '/root/e2e.sh "'$FEATURES'" "'$CLOUD_PRODUCT'" "'$REGISTRY'"'
killall -q kubectl || true
echo "successfully killed kubectl proxy"
else
echo /root/e2e.sh "${FEATURES}" "${CLOUD_PRODUCT}" "${REGISTRY}"
/root/e2e.sh "${FEATURES}" "${CLOUD_PRODUCT}" "${REGISTRY}"
fi
echo /root/e2e.sh "${FEATURES}" "${CLOUD_PRODUCT}" "${REGISTRY}"
/root/e2e.sh "${FEATURES}" "${CLOUD_PRODUCT}" "${REGISTRY}"
4 changes: 2 additions & 2 deletions ci/e2e-test-cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ steps:
- e2e-feature-gates

tags: ['e2e-test']
timeout: 7200s # 2h
queueTtl: 21600s # 6h
timeout: 5400s # 1.5h
queueTtl: 7200s # 2h // only one set of e2es should be running at once

8 changes: 6 additions & 2 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ steps:

sleep 60
done
timeout: 5400s # 90m - leave an hour for e2es to run on top of the global timeout of 2.5h
timeout: 10800s # 3h - if you change this, change the global timeout as well
env:
- 'CLOUDSDK_CORE_PROJECT=$PROJECT_ID'
- 'BUILD_ID=$BUILD_ID'
Expand Down Expand Up @@ -307,6 +307,10 @@ steps:
for version in "${!versionsAndRegions[@]}"
do
region=${versionsAndRegions[$version]}
if [ $cloudProduct = gke-autopilot ] && [ $version = 1.26 ]
then
continue
fi
if [ $cloudProduct = generic ]
then
featureWithGate="CustomFasSyncInterval=false&SafeToEvict=false&SDKGracefulTermination=false&StateAllocationFilter=false&PlayerAllocationFilter=true&PlayerTracking=true&ResetMetricsOnDelete=true&PodHostname=true&SplitControllerAndExtensions=true&FleetAllocationOverflow=true&Example=true"
Expand Down Expand Up @@ -414,7 +418,7 @@ substitutions:
_RUST_SDK_BUILD_CACHE_KEY: rust-sdk-build
_REGISTRY: us-docker.pkg.dev/${PROJECT_ID}/ci
tags: ['ci']
timeout: 9000s # 2.5h - if you change this, change e2e-wait-to-become-leader as well
timeout: 18000s # 5h: 3h (e2e-wait-to-become-leader) + 1.5h (e2e timeout) + 0.5h (everything else)
queueTtl: 259200s # 72h
images:
- '${_REGISTRY}/agones-controller'
Expand Down