Skip to content

feat: To enable better ci dashboard. #13272

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

Merged
charlielye merged 2 commits into from
Apr 3, 2025
Merged

feat: To enable better ci dashboard. #13272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af3cf85
wip
charlielye Apr 3, 2025
6ca349a
Merge branch 'master' into cl/run_id_job_id
charlielye Apr 3, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/ci3-external.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@ jobs:
REF_NAME: repo-fork/${{ github.repository }}/${{ github.head_ref }}
# We only test on amd64.
ARCH: amd64
LOG_ID: ${{ github.run_id }}
RUN_ID: ${{ github.run_id }}
run: |
./ci.sh ec2
6 changes: 4 additions & 2 deletions .github/workflows/ci3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
GITHUB_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
ARCH: ${{ matrix.settings.arch }}
LOG_ID: ${{ github.run_id }}
RUN_ID: ${{ github.run_id }}
JOB_ID: ${{ matrix.settings.arch }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
Expand Down Expand Up @@ -208,7 +209,8 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
ARCH: amd64
LOG_ID: ${{ github.run_id }}
RUN_ID: ${{ github.run_id }}
JOB_ID: g${{ matrix.number }}
INSTANCE_POSTFIX: ${{ matrix.number }}
DRY_RUN: 1
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
Expand Down
3 changes: 2 additions & 1 deletion ci3/bootstrap_ec2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ if [ -t 1 ]; then
run_cmd="run; exec zsh"
fi
else
# LOG_ID can optionally be set externally to be e.g. the GA run id.
run_cmd="ci3/aws_handle_evict run 2>&1 | ci3/add_timestamps | DUP=1 ci3/cache_log 'CI run' \$ci_log_id"
fi

Expand Down Expand Up @@ -217,6 +216,8 @@ ssh ${ssh_args:-} -F $ci3/aws/build_instance_ssh_config ubuntu@$ip "
-v /mnt/bb-crs:/home/aztec-dev/.bb-crs:ro \
-v /tmp:/tmp \
-v /dev/kmsg:/dev/kmsg \
-e RUN_ID=${RUN_ID:-} \
-e JOB_ID=${JOB_ID:-} \
-e NO_CACHE=${NO_CACHE:-} \
-e USE_TEST_CACHE=${USE_TEST_CACHE:-1} \
-e CI_REDIS='ci-redis-tiered.lzka0i.ng.0001.use2.cache.amazonaws.com' \
Expand Down
6 changes: 4 additions & 2 deletions ci3/log_ci_run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,20 @@ if [ -z "$key" ]; then

# If this is github merge queue, just keep the queue name.
if [[ "$name" =~ ^gh-readonly-queue/([^/]+)/ ]]; then
name=${BASH_REMATCH[1]}
name="${BASH_REMATCH[1]} (queue)"
fi

json=$(jq -c -j -n \
--argjson timestamp "$key" \
--arg run_id "${RUN_ID:-}" \
--arg job_id "${JOB_ID:-}" \
--arg status "$status" \
--arg msg "$msg" \
--arg name "$name" \
--arg author "$author" \
--arg arch "$(arch)" \
--argjson spot "$spot" \
'{timestamp: $timestamp, status: $status, msg: $msg, name: $name, author: $author, arch: $arch, spot: $spot}')
'{timestamp: $timestamp, run_id: $run_id, job_id: $job_id, status: $status, msg: $msg, name: $name, author: $author, arch: $arch, spot: $spot}')
# echo "$json" >&2
redis_cli ZADD ci-run $key "$json" &>/dev/null
redis_cli SETEX hb-$key 60 1 &>/dev/null
Expand Down