Skip to content

Commit 40c5481

Browse files
jschmidt-icingajschmidt-icinga
committed
(Temp) Test longer timeout on container
1 parent c0bf592 commit 40c5481

3 files changed

Lines changed: 128 additions & 128 deletions

File tree

‎.github/workflows/linux.yml‎

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -11,80 +11,80 @@ concurrency:
1111
group: linux-${{ github.event_name == 'push' && github.sha || github.ref }}
1212
cancel-in-progress: true
1313

14-
jobs:
15-
linux:
16-
name: ${{ matrix.distro }}${{ matrix.platform != 'linux/amd64' && format(' ({0})', matrix.platform) || '' }}
17-
runs-on: ubuntu-latest
18-
19-
strategy:
20-
fail-fast: false
21-
max-parallel: 2
22-
matrix:
23-
distro:
24-
# Alpine Linux to build Icinga 2 with LibreSSL, OpenBSD's default.
25-
# The "alpine:bash" image will be built below based on "alpine:3".
26-
- alpine:bash
27-
28-
- amazonlinux:2
29-
- amazonlinux:2023
30-
31-
# Raspberry Pi OS is close enough to Debian to test just one of them.
32-
# Its architecture is different, though, and covered by the Docker job.
33-
- debian:11
34-
- debian:12
35-
- debian:13
36-
37-
- fedora:41
38-
- fedora:42
39-
- fedora:43
40-
41-
- opensuse/leap:15.6
42-
- opensuse/leap:16.0
43-
44-
# We don't actually support Rocky Linux as such!
45-
# We just use that RHEL clone to test the original.
46-
- rockylinux:8
47-
- rockylinux:9
48-
- rockylinux/rockylinux:10
49-
50-
- registry.suse.com/suse/sle15:15.6
51-
- registry.suse.com/suse/sle15:15.7
52-
- registry.suse.com/bci/bci-base:16.0
53-
54-
- ubuntu:22.04
55-
- ubuntu:24.04
56-
- ubuntu:25.04
57-
- ubuntu:25.10
58-
59-
platform:
60-
- linux/amd64
61-
62-
include:
63-
- distro: debian:11
64-
platform: linux/386
65-
- distro: debian:12
66-
platform: linux/386
67-
68-
steps:
69-
- name: Checkout HEAD
70-
uses: actions/checkout@v6
71-
72-
- name: Turn on Problem Matcher
73-
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
74-
75-
- name: Restore/backup ccache
76-
uses: actions/cache@v5
77-
with:
78-
path: ccache
79-
key: ccache/${{ matrix.distro }}
80-
81-
- name: Build Alpine Docker Image
82-
if: "matrix.distro == 'alpine:bash'"
83-
run: >-
84-
docker build --file .github/workflows/alpine-bash.Dockerfile
85-
--tag alpine:bash `mktemp -d`
86-
87-
- name: Build Icinga
88-
run: >-
89-
docker run --rm -v "$(pwd):/icinga2" -e DISTRO=${{ matrix.distro }}
90-
--platform ${{ matrix.platform }} ${{ matrix.distro }} /icinga2/.github/workflows/linux.bash
14+
# jobs:
15+
# linux:
16+
# name: ${{ matrix.distro }}${{ matrix.platform != 'linux/amd64' && format(' ({0})', matrix.platform) || '' }}
17+
# runs-on: ubuntu-latest
18+
19+
# strategy:
20+
# fail-fast: false
21+
# max-parallel: 2
22+
# matrix:
23+
# distro:
24+
# # Alpine Linux to build Icinga 2 with LibreSSL, OpenBSD's default.
25+
# # The "alpine:bash" image will be built below based on "alpine:3".
26+
# - alpine:bash
27+
28+
# - amazonlinux:2
29+
# - amazonlinux:2023
30+
31+
# # Raspberry Pi OS is close enough to Debian to test just one of them.
32+
# # Its architecture is different, though, and covered by the Docker job.
33+
# - debian:11
34+
# - debian:12
35+
# - debian:13
36+
37+
# - fedora:41
38+
# - fedora:42
39+
# - fedora:43
40+
41+
# - opensuse/leap:15.6
42+
# - opensuse/leap:16.0
43+
44+
# # We don't actually support Rocky Linux as such!
45+
# # We just use that RHEL clone to test the original.
46+
# - rockylinux:8
47+
# - rockylinux:9
48+
# - rockylinux/rockylinux:10
49+
50+
# - registry.suse.com/suse/sle15:15.6
51+
# - registry.suse.com/suse/sle15:15.7
52+
# - registry.suse.com/bci/bci-base:16.0
53+
54+
# - ubuntu:22.04
55+
# - ubuntu:24.04
56+
# - ubuntu:25.04
57+
# - ubuntu:25.10
58+
59+
# platform:
60+
# - linux/amd64
61+
62+
# include:
63+
# - distro: debian:11
64+
# platform: linux/386
65+
# - distro: debian:12
66+
# platform: linux/386
67+
68+
# steps:
69+
# - name: Checkout HEAD
70+
# uses: actions/checkout@v6
71+
72+
# - name: Turn on Problem Matcher
73+
# run: echo "::add-matcher::.github/problem-matchers/gcc.json"
74+
75+
# - name: Restore/backup ccache
76+
# uses: actions/cache@v5
77+
# with:
78+
# path: ccache
79+
# key: ccache/${{ matrix.distro }}
80+
81+
# - name: Build Alpine Docker Image
82+
# if: "matrix.distro == 'alpine:bash'"
83+
# run: >-
84+
# docker build --file .github/workflows/alpine-bash.Dockerfile
85+
# --tag alpine:bash `mktemp -d`
86+
87+
# - name: Build Icinga
88+
# run: >-
89+
# docker run --rm -v "$(pwd):/icinga2" -e DISTRO=${{ matrix.distro }}
90+
# --platform ${{ matrix.platform }} ${{ matrix.distro }} /icinga2/.github/workflows/linux.bash

‎.github/workflows/windows.yml‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -11,53 +11,53 @@ concurrency:
1111
group: windows-${{ github.event_name == 'push' && github.sha || github.ref }}
1212
cancel-in-progress: true
1313

14-
jobs:
15-
windows:
16-
name: Windows
17-
18-
strategy:
19-
fail-fast: false
20-
max-parallel: 1
21-
matrix:
22-
bits: [32, 64]
23-
24-
runs-on: windows-2025
25-
26-
env:
27-
BITS: '${{ matrix.bits }}'
28-
CMAKE_BUILD_TYPE: RelWithDebInfo
29-
30-
steps:
31-
- name: Checkout HEAD
32-
uses: actions/checkout@v6
33-
with:
34-
fetch-depth: 0
35-
36-
- name: Build tools
37-
run: |
38-
Set-PSDebug -Trace 1
39-
& .\doc\win-dev.ps1
40-
41-
- name: Turn on Problem Matcher
42-
run: |
43-
Write-Host "::add-matcher::.github/problem-matchers/msvc.json"
44-
45-
- name: Binary
46-
run: |
47-
Set-PSDebug -Trace 1
48-
& .\tools\win32\load-vsenv.ps1
49-
& powershell.exe .\tools\win32\configure.ps1
50-
if ($LastExitCode -ne 0) { throw "Error during configure" }
51-
& powershell.exe .\tools\win32\build.ps1
52-
if ($LastExitCode -ne 0) { throw "Error during build" }
53-
& powershell.exe .\tools\win32\test.ps1
54-
if ($LastExitCode -ne 0) { throw "Error during test" }
55-
56-
- name: Show Log Files
57-
if: ${{ always() }}
58-
run: |
59-
foreach ($file in Get-ChildItem -Recurse -Filter "*.log") {
60-
Write-Host "::group::$($file.FullName)"
61-
Get-Content $file.FullName
62-
Write-Host "::endgroup::"
63-
}
14+
# jobs:
15+
# windows:
16+
# name: Windows
17+
18+
# strategy:
19+
# fail-fast: false
20+
# max-parallel: 1
21+
# matrix:
22+
# bits: [32, 64]
23+
24+
# runs-on: windows-2025
25+
26+
# env:
27+
# BITS: '${{ matrix.bits }}'
28+
# CMAKE_BUILD_TYPE: RelWithDebInfo
29+
30+
# steps:
31+
# - name: Checkout HEAD
32+
# uses: actions/checkout@v6
33+
# with:
34+
# fetch-depth: 0
35+
36+
# - name: Build tools
37+
# run: |
38+
# Set-PSDebug -Trace 1
39+
# & .\doc\win-dev.ps1
40+
41+
# - name: Turn on Problem Matcher
42+
# run: |
43+
# Write-Host "::add-matcher::.github/problem-matchers/msvc.json"
44+
45+
# - name: Binary
46+
# run: |
47+
# Set-PSDebug -Trace 1
48+
# & .\tools\win32\load-vsenv.ps1
49+
# & powershell.exe .\tools\win32\configure.ps1
50+
# if ($LastExitCode -ne 0) { throw "Error during configure" }
51+
# & powershell.exe .\tools\win32\build.ps1
52+
# if ($LastExitCode -ne 0) { throw "Error during build" }
53+
# & powershell.exe .\tools\win32\test.ps1
54+
# if ($LastExitCode -ne 0) { throw "Error during test" }
55+
56+
# - name: Show Log Files
57+
# if: ${{ always() }}
58+
# run: |
59+
# foreach ($file in Get-ChildItem -Recurse -Filter "*.log") {
60+
# Write-Host "::group::$($file.FullName)"
61+
# Get-Content $file.FullName
62+
# Write-Host "::endgroup::"
63+
# }

‎test/perfdata-perfdatawriterconnection.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ BOOST_AUTO_TEST_CASE(stuck_sending)
206206
std::this_thread::sleep_for(10ms);
207207
}
208208

209-
GetConnection().StartDisconnectTimeout(50ms);
209+
GetConnection().StartDisconnectTimeout(1s);
210210
}};
211211

212212
// Allocate a large string that will fill the buffers on both sides of the connection, in

0 commit comments

Comments
 (0)