From 39bc81be5fcb7faa39070c09c6052dbfabd4c87a Mon Sep 17 00:00:00 2001 From: WenyXu Date: Fri, 18 Sep 2026 03:37:14 +0000 Subject: [PATCH] fix(ci): update vmbench runtime and stage benchmark artifacts Signed-off-by: WenyXu --- .github/workflows/vmbench-long-range.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/vmbench-long-range.yml b/.github/workflows/vmbench-long-range.yml index 703dd5b50d4..6073cc380f4 100644 --- a/.github/workflows/vmbench-long-range.yml +++ b/.github/workflows/vmbench-long-range.yml @@ -33,7 +33,7 @@ on: runtime_image: description: Aliyun runtime image (tag or digest reference) type: string - default: greptime-registry.cn-hangzhou.cr.aliyuncs.com/tools/o11ybench-runtime:20260917-4d3e9188@sha256:5cafb9f22a893350164c349f284f67164370f40c61f4bd2ab969390469c98723 + default: greptime-registry.cn-hangzhou.cr.aliyuncs.com/tools/o11ybench-runtime:20260918-d83431f6@sha256:9226b3566965b24c090ecca64cd384b1789006c1ccfbadd64112a7c59747e80f required: true ecs_instance_type: description: ECS instance type (independent of Query Regression) @@ -199,6 +199,7 @@ jobs: METADATA_ROOT: ${{ github.workspace }}/vmbench-metadata O11YBENCH_DIR: ${{ github.workspace }}/o11ybench TSDG_PARALLELISM: '8' + O11YBENCH_GENERATOR_CPUS: '4' steps: - name: Checkout matching benchmark tools uses: actions/checkout@v4 @@ -257,16 +258,24 @@ jobs: if: always() run: | docker ps -aq --filter "label=o11ybench.run-id=$RUN_ID-warm" | xargs -r docker rm -fv + - name: Stage benchmark artifacts + if: always() + run: | + mkdir -p "$RUNNER_TEMP/vmbench-artifacts" + if [[ -d "$METADATA_ROOT" ]]; then + rsync -a --no-owner --no-group "$METADATA_ROOT" "$RUNNER_TEMP/vmbench-artifacts/" + fi + if [[ -d "$ARTIFACT_ROOT-warm" ]]; then + # Exclude DB directories before traversal; they may be unreadable by the runner. + rsync -a --no-owner --no-group --exclude='db-data/' --exclude='/data/*.bin' \ + "$ARTIFACT_ROOT-warm/" "$RUNNER_TEMP/vmbench-artifacts/$(basename "$ARTIFACT_ROOT-warm")/" + fi - name: Upload HTML and results (no dataset or DB files) if: always() uses: actions/upload-artifact@v4 with: name: vmbench-long-range-${{ github.run_id }}-${{ github.run_attempt }} - path: | - ${{ env.METADATA_ROOT }} - ${{ env.ARTIFACT_ROOT }}-warm - !${{ env.ARTIFACT_ROOT }}-warm/data/*.bin - !${{ env.ARTIFACT_ROOT }}-warm/**/db-data/** + path: ${{ runner.temp }}/vmbench-artifacts if-no-files-found: warn retention-days: 14 teardown: