Skip to content

Commit e4b82eb

Browse files
committed
WSL machine tests: increase kernel boot timeout
This is to avoid CI/CD flakes and is based on this analysis of the WSL flakes logs: microsoft/WSL#13301 (comment) Signed-off-by: Mario Loriedo <[email protected]>
1 parent 80b20c7 commit e4b82eb

File tree

5 files changed

+106
-38
lines changed

5 files changed

+106
-38
lines changed

.cirrus.yml

Lines changed: 46 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -238,22 +238,22 @@ alt_build_task:
238238
TEST_FLAVOR: "altbuild"
239239
gce_instance: *fastvm
240240
matrix:
241-
- env:
242-
ALT_NAME: 'Build Each Commit'
241+
# - env:
242+
# ALT_NAME: 'Build Each Commit'
243243
- env:
244244
# TODO: Replace with task using `winmake` to build
245245
# binary and archive installation zip file.
246246
ALT_NAME: 'Windows Cross' # N/B: Referenced by URLencoded strings elsewhere
247-
- env:
248-
ALT_NAME: 'Alt Arch. x86 Cross'
249-
- env:
250-
ALT_NAME: 'Alt Arch. ARM Cross'
251-
- env:
252-
ALT_NAME: 'Alt Arch. MIPS Cross'
253-
- env:
254-
ALT_NAME: 'Alt Arch. MIPS64 Cross'
255-
- env:
256-
ALT_NAME: 'Alt Arch. Other Cross'
247+
# - env:
248+
# ALT_NAME: 'Alt Arch. x86 Cross'
249+
# - env:
250+
# ALT_NAME: 'Alt Arch. ARM Cross'
251+
# - env:
252+
# ALT_NAME: 'Alt Arch. MIPS Cross'
253+
# - env:
254+
# ALT_NAME: 'Alt Arch. MIPS64 Cross'
255+
# - env:
256+
# ALT_NAME: 'Alt Arch. Other Cross'
257257
# This task cannot make use of the shared repo.tar.zst artifact.
258258
clone_script: *full_clone
259259
setup_script: *setup
@@ -359,11 +359,11 @@ build_success_task:
359359
alias: build_success
360360
depends_on:
361361
- validate-source
362-
- build
363-
- build_aarch64
362+
# - build
363+
# - build_aarch64
364364
- alt_build
365-
- osx_alt_build
366-
- freebsd_alt_build
365+
# - osx_alt_build
366+
# - freebsd_alt_build
367367
env:
368368
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
369369
container: &smallcontainer
@@ -381,6 +381,7 @@ build_success_task:
381381
bindings_task:
382382
name: "Test Bindings"
383383
alias: bindings
384+
skip: true # Temporarily disabled
384385
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
385386
# only when: - main rules (see doc above); or
386387
# - bindings test code is changed; or
@@ -431,6 +432,7 @@ bindings_task:
431432
swagger_task:
432433
name: "Test Swagger"
433434
alias: swagger
435+
skip: true # Temporarily disabled
434436
depends_on: *build
435437
gce_instance: *standardvm
436438
env:
@@ -452,6 +454,7 @@ swagger_task:
452454

453455
win_installer_task:
454456
name: "Verify Win Installer Build"
457+
skip: true # Temporarily disabled
455458
matrix:
456459
- env:
457460
CONTAINERS_MACHINE_PROVIDER: 'wsl'
@@ -517,6 +520,7 @@ win_installer_task:
517520
docker-py_test_task:
518521
name: Docker-py Compat.
519522
alias: docker-py_test
523+
skip: true # Temporarily disabled
520524
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
521525
# only when: - main rules (see doc above); or
522526
# - docker-py test code is changed; or
@@ -543,6 +547,7 @@ docker-py_test_task:
543547
unit_test_task:
544548
name: "Unit tests on $DISTRO_NV"
545549
alias: unit_test
550+
skip: true # Temporarily disabled
546551
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
547552
# only when: - main rules (see doc above); or
548553
# - unit test files are changed (contains a false positves such as test/e2e/
@@ -574,6 +579,7 @@ unit_test_task:
574579
unit_test_windows_task:
575580
name: "Unit tests on Windows"
576581
alias: unit_test_windows
582+
skip: true # Temporarily disabled
577583
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
578584
# only when: - main rules (see doc above); or
579585
# - unit test files are changed (contains a false positves such as test/e2e/
@@ -591,9 +597,6 @@ unit_test_windows_task:
591597
# everywhere to do so here it would mean we would need duplicate the
592598
# full big only_if condition which is more difficult to maintain so
593599
# use the skip here.
594-
skip: &skip_rhel_release |
595-
$CIRRUS_BRANCH =~ 'v[0-9\.]+-rhel' ||
596-
$CIRRUS_BASE_BRANCH =~ 'v[0-9\.]+-rhel'
597600
depends_on: *build
598601
ec2_instance: *windows
599602
timeout_in: 20m
@@ -612,6 +615,7 @@ unit_test_windows_task:
612615
apiv2_test_task:
613616
name: "APIv2 test on $DISTRO_NV ($PRIV_NAME)"
614617
alias: apiv2_test
618+
skip: true # Temporarily disabled
615619
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
616620
# only when: - main rules (see doc above); or
617621
# - apiv2 test code is changed; or
@@ -641,6 +645,7 @@ apiv2_test_task:
641645
compose_test_task:
642646
name: "$TEST_FLAVOR test on $DISTRO_NV ($PRIV_NAME)"
643647
alias: compose_test
648+
skip: true # Temporarily disabled
644649
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
645650
# only when: - main rules (see doc above); or
646651
# - compose test code is changed; or
@@ -673,6 +678,7 @@ local_integration_test_task: &local_integration_test_task
673678
# <int.|sys.> <podman|remote> <Distro NV> <root|rootless>
674679
name: &std_name_fmt "$TEST_FLAVOR $PODBIN_NAME $DISTRO_NV $PRIV_NAME $TEST_ENVIRON ${CI_DESIRED_DATABASE}"
675680
alias: local_integration_test
681+
skip: true # Temporarily disabled
676682
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
677683
# only when: - main rules (see doc above); or
678684
# - int test code is changed; or
@@ -706,6 +712,7 @@ local_integration_test_task: &local_integration_test_task
706712
remote_integration_test_task:
707713
<<: *local_integration_test_task
708714
alias: remote_integration_test
715+
skip: true # Temporarily disabled
709716
env:
710717
TEST_FLAVOR: int
711718
PODBIN_NAME: remote
@@ -716,6 +723,7 @@ remote_integration_test_task:
716723
container_integration_test_task:
717724
name: *std_name_fmt
718725
alias: container_integration_test
726+
skip: true # Temporarily disabled
719727
# Docs: ./contrib/cirrus/CIModes.md
720728
only_if: *only_if_int_test
721729
depends_on: *build
@@ -743,6 +751,7 @@ container_integration_test_task:
743751
rootless_integration_test_task:
744752
name: *std_name_fmt
745753
alias: rootless_integration_test
754+
skip: true # Temporarily disabled
746755
# Docs: ./contrib/cirrus/CIModes.md
747756
only_if: *only_if_int_test
748757
depends_on: *build
@@ -760,6 +769,7 @@ rootless_integration_test_task:
760769
podman_machine_task:
761770
name: *std_name_fmt
762771
alias: podman_machine
772+
skip: true # Temporarily disabled
763773
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
764774
# only when: - main rules (see doc above); or
765775
# - machine code files are changed
@@ -789,6 +799,7 @@ podman_machine_task:
789799
podman_machine_aarch64_task:
790800
name: *std_name_fmt
791801
alias: podman_machine_aarch64
802+
skip: true # Temporarily disabled
792803
only_if: *only_if_machine_test
793804
depends_on: *build
794805
ec2_instance:
@@ -826,19 +837,16 @@ podman_machine_windows_task:
826837
# everywhere to do so here it would mean we would need duplicate the
827838
# full big only_if condition which is more difficult to maintain so
828839
# use the skip here.
829-
skip: *skip_rhel_release
830840
depends_on: *build
831841
ec2_instance:
832842
<<: *windows
833843
type: z1d.metal
834844
platform: windows
835-
timeout_in: 60m
845+
timeout_in: 90m
836846
env: *winenv
837847
matrix:
838848
- env:
839849
TEST_FLAVOR: "machine-wsl"
840-
- env:
841-
TEST_FLAVOR: "machine-hyperv"
842850
clone_script: *winclone
843851
# This depends on an instance with an local NVMe storage so we can make use of fast IO
844852
# Our machine tests are IO bound so this is rather imporant to speed them up a lot.
@@ -870,8 +878,8 @@ podman_machine_windows_task:
870878
podman_machine_mac_task:
871879
name: *std_name_fmt
872880
alias: podman_machine_mac
881+
skip: true # Temporarily disabled
873882
only_if: *only_if_machine_test
874-
skip: *skip_rhel_release
875883
depends_on: *build
876884
persistent_worker: *mac_pw
877885
timeout_in: 60m
@@ -918,6 +926,7 @@ podman_machine_mac_task:
918926
local_system_test_task: &local_system_test_task
919927
name: *std_name_fmt
920928
alias: local_system_test
929+
skip: true # Temporarily disabled
921930
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
922931
# only when: - main rules (see doc above); or
923932
# - sys test code is changed; or
@@ -943,6 +952,7 @@ local_system_test_task: &local_system_test_task
943952
local_system_test_aarch64_task: &local_system_test_task_aarch64
944953
name: *std_name_fmt
945954
alias: local_system_test_aarch64
955+
skip: true # Temporarily disabled
946956
# Docs: ./contrib/cirrus/CIModes.md
947957
only_if: *only_if_system_test
948958
depends_on: *build
@@ -961,6 +971,7 @@ local_system_test_aarch64_task: &local_system_test_task_aarch64
961971
remote_system_test_task:
962972
<<: *local_system_test_task
963973
alias: remote_system_test
974+
skip: true # Temporarily disabled
964975
env:
965976
TEST_FLAVOR: sys
966977
PODBIN_NAME: remote
@@ -969,12 +980,14 @@ remote_system_test_task:
969980
remote_system_test_aarch64_task:
970981
<<: *local_system_test_task_aarch64
971982
alias: remote_system_test_aarch64
983+
skip: true # Temporarily disabled
972984
env:
973985
TEST_FLAVOR: sys
974986
PODBIN_NAME: remote
975987

976988

977989
rootless_remote_system_test_task:
990+
skip: true # Temporarily disabled
978991
matrix:
979992
# Minimal sanity testing: only the latest Fedora
980993
- env:
@@ -995,6 +1008,7 @@ rootless_remote_system_test_task:
9951008
rootless_system_test_task:
9961009
name: *std_name_fmt
9971010
alias: rootless_system_test
1011+
skip: true # Temporarily disabled
9981012
# Docs: ./contrib/cirrus/CIModes.md
9991013
only_if: *only_if_system_test
10001014
depends_on: *build
@@ -1013,6 +1027,7 @@ rootless_system_test_task:
10131027
farm_test_task:
10141028
name: *std_name_fmt
10151029
alias: farm_test
1030+
skip: true # Temporarily disabled
10161031
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
10171032
# only when: - main rules (see doc above); or
10181033
# - farm test code is changed or one of the shared helper import files from the system test; or
@@ -1037,6 +1052,7 @@ farm_test_task:
10371052
buildah_bud_test_task:
10381053
name: *std_name_fmt
10391054
alias: buildah_bud_test
1055+
skip: true # Temporarily disabled
10401056
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
10411057
# only when: - main rules (see doc above); or
10421058
# - podman build source code files or bud tests files are changed
@@ -1064,6 +1080,7 @@ buildah_bud_test_task:
10641080
upgrade_test_task:
10651081
name: "Upgrade test: from $PODMAN_UPGRADE_FROM"
10661082
alias: upgrade_test
1083+
skip: true # Temporarily disabled
10671084
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
10681085
# only when: - main rules (see doc above); or
10691086
# - upgrade test code is changed or one of the shared helper import files from the system test; or
@@ -1103,6 +1120,7 @@ upgrade_test_task:
11031120
meta_task:
11041121
name: "VM img. keepalive"
11051122
alias: meta
1123+
skip: true # Temporarily disabled
11061124
container:
11071125
cpu: 2
11081126
memory: 2
@@ -1135,6 +1153,7 @@ success_task:
11351153
# Ref: https://github.com/openshift/release/pull/48855
11361154
name: "Total Success"
11371155
alias: success
1156+
skip: true # Temporarily disabled
11381157
# N/B: ALL tasks must be listed here, minus their '_task' suffix.
11391158
depends_on:
11401159
- build_success
@@ -1176,6 +1195,7 @@ success_task:
11761195
artifacts_task:
11771196
name: "Artifacts"
11781197
alias: artifacts
1198+
skip: true # Temporarily disabled
11791199
# Docs: ./contrib/cirrus/CIModes.md
11801200
only_if: *no_rhel_release
11811201
depends_on:
@@ -1225,6 +1245,7 @@ artifacts_task:
12251245
release_task:
12261246
name: "Verify Release"
12271247
alias: release
1248+
skip: true # Temporarily disabled
12281249
# This should _only_ run for new tags
12291250
# Docs: ./contrib/cirrus/CIModes.md
12301251
only_if: $CIRRUS_TAG != ''
@@ -1249,6 +1270,7 @@ release_task:
12491270
release_test_task:
12501271
name: "Optional Release Test"
12511272
alias: release_test
1273+
skip: true # Temporarily disabled
12521274
# Release-PRs always include "release" or "Bump" in the title
12531275
# Docs: ./contrib/cirrus/CIModes.md
12541276
only_if: $CIRRUS_CHANGE_TITLE =~ '.*((release)|(bump)).*'

contrib/cirrus/win-collect-wsl-logs-start.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ if ($LogProfile -eq $null -Or ![System.IO.File]::Exists($LogProfile))
4545
{
4646
$url = "https://raw.githubusercontent.com/microsoft/WSL/master/diagnostics/wsl_storage.wprp"
4747
}
48+
elseif ($LogProfile -eq "hvsocket")
49+
{
50+
$url = "https://raw.githubusercontent.com/microsoft/WSL/master/diagnostics/wsl_hvsocket.wprp"
51+
}
4852
else
4953
{
5054
Write-Error "Unknown log profile: $LogProfile"

contrib/cirrus/win-collect-wsl-logs-stop.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@ Write-Host "Saving WSL logs..."
3535
wpr.exe -stop $folder/logs.etl 2>&1 >> $wprOutputLog
3636

3737
$logArchive = "$(Resolve-Path $folder).zip"
38+
Write-Host "Compressing logs..."
3839
Compress-Archive -Path $folder -DestinationPath $logArchive
3940
Remove-Item $folder -Recurse
4041

4142
$fileName = (Get-Item $logArchive).Name
4243
$parentFolder = (Get-Item $logArchive).Directory.Parent.FullName
44+
Write-Host "Moving logs to parent folder..."
4345
Move-Item -Path $logArchive -Destination $parentFolder
4446

4547
Write-Host -ForegroundColor Green "Logs saved in: ${parentFolder}/${fileName}"

0 commit comments

Comments
 (0)