Skip to content
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
13 changes: 11 additions & 2 deletions .github/workflows/sync-cloud-run-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -376,10 +376,19 @@ jobs:
scheduler="$(awk -F= '$1 == "scheduler" { print $2 }' "${BASELINE_PATH}")"
iam="$(awk -F= '$1 == "iam" { print $2 }' "${BASELINE_PATH}")"
revision_name="$(gcloud run services describe "${CLOUD_RUN_SERVICE}" --project="${GCP_PROJECT_ID}" --region="${CLOUD_RUN_REGION}" --format='value(status.latestCreatedRevisionName)')"
ready_revision="$(gcloud run services describe "${CLOUD_RUN_SERVICE}" --project="${GCP_PROJECT_ID}" --region="${CLOUD_RUN_REGION}" --format='value(status.latestReadyRevisionName)')"
revision_sha="$(gcloud run revisions describe "${revision_name}" --project="${GCP_PROJECT_ID}" --region="${CLOUD_RUN_REGION}" --format='value(metadata.labels.commit-sha)')"
revision_image="$(gcloud run revisions describe "${revision_name}" --project="${GCP_PROJECT_ID}" --region="${CLOUD_RUN_REGION}" --format='value(spec.containers.image)')"
[ "${revision_name}" = "${ready_revision}" ] || fail_readback "created revision is not ready"
revision_ready="False"
for _ in $(seq 1 30); do
revision_ready="$(
{ gcloud run revisions describe "${revision_name}" --project="${GCP_PROJECT_ID}" --region="${CLOUD_RUN_REGION}" --format='json(status.conditions)' 2>/dev/null \
| python3 -c 'import json, sys; conditions = json.load(sys.stdin) or []; print("True" if any(isinstance(condition, dict) and condition.get("type") == "Ready" and condition.get("status") == "True" for condition in conditions) else "False")' 2>/dev/null; } \
|| printf 'False'
)"
[ "${revision_ready}" = "True" ] && break
sleep 2
done
[ "${revision_ready}" = "True" ] || fail_readback "created revision did not become ready"
[ "${revision_sha}" = "${EXPECTED_SHA}" ] || fail_readback "revision commit SHA mismatch"
[[ "${revision_image}" == *"${EXPECTED_IMAGE_DIGEST}"* ]] || fail_readback "revision image digest mismatch"
[ "${traffic}" = "$(active_traffic_digest)" ] || fail_readback "effective traffic changed"
Expand Down
6 changes: 6 additions & 0 deletions tests/test_sync_cloud_run_env_workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,12 @@ def test_sync_cloud_run_env_workflow_is_fail_closed_and_no_traffic_by_default():
assert "Verify no-traffic deployment readback" in workflow
assert "active_traffic_digest()" in workflow
assert 'fail_readback "effective traffic changed"' in workflow
assert "latestReadyRevisionName" not in deploy_block
assert "for _ in $(seq 1 30); do" in deploy_block
assert "--format='json(status.conditions)'" in deploy_block
assert 'condition.get("type") == "Ready"' in deploy_block
assert 'condition.get("status") == "True"' in deploy_block
assert 'fail_readback "created revision did not become ready"' in deploy_block
assert 'inputs.allow_configuration_sync }}" != "true"' in workflow
assert 'inputs.allow_traffic_promotion == true' in workflow
assert 'inputs.allow_cleanup == true' in workflow