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
62 changes: 30 additions & 32 deletions .github/workflows/slo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: SLO

on:
pull_request:
types: [opened, reopened, synchronize, labeled]
type: [labeled]

jobs:
ydb-slo-action:
Expand Down Expand Up @@ -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
#
5 changes: 1 addition & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,6 @@
<id>jdk8-bootstrap</id>
<activation>
<jdk>[9,)</jdk>
<property>
<name>argLine</name>
</property>
</activation>
<properties>
Comment thread
alex268 marked this conversation as resolved.
<argLine></argLine>
Expand All @@ -281,7 +278,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- Hides warnings of mockito and jacoco usage in tests on JDK 21+ -->
<argLine>${argLine} -XX:+EnableDynamicAgentLoading</argLine>
<argLine>@{argLine} -XX:+EnableDynamicAgentLoading</argLine>
</configuration>
</plugin>
</plugins>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down