diff --git a/.github/workflows/slo.yml b/.github/workflows/slo.yml index 35e9dc2bd..e5bdf1eae 100644 --- a/.github/workflows/slo.yml +++ b/.github/workflows/slo.yml @@ -2,7 +2,7 @@ name: SLO on: pull_request: - types: [opened, reopened, synchronize, labeled] + type: [labeled] jobs: ydb-slo-action: @@ -128,34 +128,32 @@ jobs: workload_baseline_image: ydb-app-baseline workload_baseline_command: ${{ matrix.sdk.command }} --read-rps 1000 --write-rps 100 - publish-slo-report: - needs: ydb-slo-action - runs-on: ubuntu-latest - name: Publish YDB SLO Report - permissions: - checks: write - contents: read - pull-requests: write - steps: - - name: Publish YDB SLO Report - uses: ydb-platform/ydb-slo-action/report@v2 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - github_run_id: ${{ github.event.workflow_run.id }} - - remove-slo-label: - needs: ydb-slo-action - runs-on: ubuntu-latest - name: Remove SLO Label - permissions: - pull-requests: write - steps: - - name: Remove SLO label from PR - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PRS: ${{ toJSON(github.event.workflow_run.pull_requests) }} - REPO: ${{ github.event.workflow_run.repository.full_name }} - run: | - set -euo pipefail - PR=$(jq -r '.[0].number' <<<"$PRS") - gh pr edit "$PR" --repo "$REPO" --remove-label SLO +# publish-slo-report: +# needs: ydb-slo-action +# runs-on: ubuntu-latest +# name: Publish YDB SLO Report +# permissions: +# issues: write +# checks: write +# contents: read +# pull-requests: write +# steps: +# - name: Checkout current SDK version +# uses: actions/checkout@v5 +# +# - name: Publish YDB SLO Report +# uses: ydb-platform/ydb-slo-action/report@v2 +# with: +# github_token: ${{ secrets.GITHUB_TOKEN }} +# github_run_id: ${{ github.event.workflow_run.id }} +# +# - name: Remove SLO label from PR +# env: +# GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# PRS: ${{ toJSON(github.event.workflow_run.pull_requests) }} +# REPO: ${{ github.event.workflow_run.repository.full_name }} +# run: | +# set -euo pipefail +# PR=$(jq -r '.[0].number' <<<"$PRS") +# gh pr edit "$PR" --repo "$REPO" --remove-label SLO +# diff --git a/pom.xml b/pom.xml index 0601d22bc..ef3f89852 100644 --- a/pom.xml +++ b/pom.xml @@ -260,9 +260,6 @@ jdk8-bootstrap [9,) - - argLine - @@ -281,7 +278,7 @@ maven-surefire-plugin - ${argLine} -XX:+EnableDynamicAgentLoading + @{argLine} -XX:+EnableDynamicAgentLoading diff --git a/table/src/test/java/tech/ydb/table/impl/pool/FutureHelper.java b/table/src/test/java/tech/ydb/table/impl/pool/FutureHelper.java index 131889a52..1476e98e5 100644 --- a/table/src/test/java/tech/ydb/table/impl/pool/FutureHelper.java +++ b/table/src/test/java/tech/ydb/table/impl/pool/FutureHelper.java @@ -64,7 +64,11 @@ private void futureHasException(CompletableFuture future, String message) { Throwable reason = ex.getCause(); Assert.assertEquals("Completion exception message", message, reason.getMessage()); } catch (CancellationException ex) { - Assert.assertEquals("Exception message", message, ex.getMessage()); + if (ex.getCause() != null) { + Assert.assertEquals("Exception message", message, ex.getCause().getMessage()); + } else { + Assert.assertEquals("Exception message", message, ex.getMessage()); + } } catch (InterruptedException ex) { Assert.assertNotNull("Test interrupted", ex); }