Skip to content

Commit 28c044e

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 28c044e

File tree

5 files changed

+106
-37
lines changed

5 files changed

+106
-37
lines changed

.cirrus.yml

Lines changed: 47 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ validate-source_task:
138138
build_task:
139139
alias: 'build'
140140
name: 'Build for $DISTRO_NV' # N/B: Referenced by URLencoded strings elsewhere
141+
skip: true # Temporarily disabled
141142
gce_instance: &fastvm
142143
image_project: libpod-218412
143144
zone: "us-central1-a"
@@ -238,22 +239,22 @@ alt_build_task:
238239
TEST_FLAVOR: "altbuild"
239240
gce_instance: *fastvm
240241
matrix:
241-
- env:
242-
ALT_NAME: 'Build Each Commit'
242+
# - env:
243+
# ALT_NAME: 'Build Each Commit'
243244
- env:
244245
# TODO: Replace with task using `winmake` to build
245246
# binary and archive installation zip file.
246247
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'
248+
# - env:
249+
# ALT_NAME: 'Alt Arch. x86 Cross'
250+
# - env:
251+
# ALT_NAME: 'Alt Arch. ARM Cross'
252+
# - env:
253+
# ALT_NAME: 'Alt Arch. MIPS Cross'
254+
# - env:
255+
# ALT_NAME: 'Alt Arch. MIPS64 Cross'
256+
# - env:
257+
# ALT_NAME: 'Alt Arch. Other Cross'
257258
# This task cannot make use of the shared repo.tar.zst artifact.
258259
clone_script: *full_clone
259260
setup_script: *setup
@@ -359,11 +360,11 @@ build_success_task:
359360
alias: build_success
360361
depends_on:
361362
- validate-source
362-
- build
363-
- build_aarch64
363+
# - build
364+
# - build_aarch64
364365
- alt_build
365-
- osx_alt_build
366-
- freebsd_alt_build
366+
# - osx_alt_build
367+
# - freebsd_alt_build
367368
env:
368369
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
369370
container: &smallcontainer
@@ -381,6 +382,7 @@ build_success_task:
381382
bindings_task:
382383
name: "Test Bindings"
383384
alias: bindings
385+
skip: true # Temporarily disabled
384386
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
385387
# only when: - main rules (see doc above); or
386388
# - bindings test code is changed; or
@@ -431,6 +433,7 @@ bindings_task:
431433
swagger_task:
432434
name: "Test Swagger"
433435
alias: swagger
436+
skip: true # Temporarily disabled
434437
depends_on: *build
435438
gce_instance: *standardvm
436439
env:
@@ -452,6 +455,7 @@ swagger_task:
452455

453456
win_installer_task:
454457
name: "Verify Win Installer Build"
458+
skip: true # Temporarily disabled
455459
matrix:
456460
- env:
457461
CONTAINERS_MACHINE_PROVIDER: 'wsl'
@@ -517,6 +521,7 @@ win_installer_task:
517521
docker-py_test_task:
518522
name: Docker-py Compat.
519523
alias: docker-py_test
524+
skip: true # Temporarily disabled
520525
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
521526
# only when: - main rules (see doc above); or
522527
# - docker-py test code is changed; or
@@ -543,6 +548,7 @@ docker-py_test_task:
543548
unit_test_task:
544549
name: "Unit tests on $DISTRO_NV"
545550
alias: unit_test
551+
skip: true # Temporarily disabled
546552
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
547553
# only when: - main rules (see doc above); or
548554
# - unit test files are changed (contains a false positves such as test/e2e/
@@ -574,6 +580,7 @@ unit_test_task:
574580
unit_test_windows_task:
575581
name: "Unit tests on Windows"
576582
alias: unit_test_windows
583+
skip: true # Temporarily disabled
577584
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
578585
# only when: - main rules (see doc above); or
579586
# - unit test files are changed (contains a false positves such as test/e2e/
@@ -591,9 +598,6 @@ unit_test_windows_task:
591598
# everywhere to do so here it would mean we would need duplicate the
592599
# full big only_if condition which is more difficult to maintain so
593600
# use the skip here.
594-
skip: &skip_rhel_release |
595-
$CIRRUS_BRANCH =~ 'v[0-9\.]+-rhel' ||
596-
$CIRRUS_BASE_BRANCH =~ 'v[0-9\.]+-rhel'
597601
depends_on: *build
598602
ec2_instance: *windows
599603
timeout_in: 20m
@@ -612,6 +616,7 @@ unit_test_windows_task:
612616
apiv2_test_task:
613617
name: "APIv2 test on $DISTRO_NV ($PRIV_NAME)"
614618
alias: apiv2_test
619+
skip: true # Temporarily disabled
615620
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
616621
# only when: - main rules (see doc above); or
617622
# - apiv2 test code is changed; or
@@ -641,6 +646,7 @@ apiv2_test_task:
641646
compose_test_task:
642647
name: "$TEST_FLAVOR test on $DISTRO_NV ($PRIV_NAME)"
643648
alias: compose_test
649+
skip: true # Temporarily disabled
644650
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
645651
# only when: - main rules (see doc above); or
646652
# - compose test code is changed; or
@@ -673,6 +679,7 @@ local_integration_test_task: &local_integration_test_task
673679
# <int.|sys.> <podman|remote> <Distro NV> <root|rootless>
674680
name: &std_name_fmt "$TEST_FLAVOR $PODBIN_NAME $DISTRO_NV $PRIV_NAME $TEST_ENVIRON ${CI_DESIRED_DATABASE}"
675681
alias: local_integration_test
682+
skip: true # Temporarily disabled
676683
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
677684
# only when: - main rules (see doc above); or
678685
# - int test code is changed; or
@@ -706,6 +713,7 @@ local_integration_test_task: &local_integration_test_task
706713
remote_integration_test_task:
707714
<<: *local_integration_test_task
708715
alias: remote_integration_test
716+
skip: true # Temporarily disabled
709717
env:
710718
TEST_FLAVOR: int
711719
PODBIN_NAME: remote
@@ -716,6 +724,7 @@ remote_integration_test_task:
716724
container_integration_test_task:
717725
name: *std_name_fmt
718726
alias: container_integration_test
727+
skip: true # Temporarily disabled
719728
# Docs: ./contrib/cirrus/CIModes.md
720729
only_if: *only_if_int_test
721730
depends_on: *build
@@ -743,6 +752,7 @@ container_integration_test_task:
743752
rootless_integration_test_task:
744753
name: *std_name_fmt
745754
alias: rootless_integration_test
755+
skip: true # Temporarily disabled
746756
# Docs: ./contrib/cirrus/CIModes.md
747757
only_if: *only_if_int_test
748758
depends_on: *build
@@ -760,6 +770,7 @@ rootless_integration_test_task:
760770
podman_machine_task:
761771
name: *std_name_fmt
762772
alias: podman_machine
773+
skip: true # Temporarily disabled
763774
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
764775
# only when: - main rules (see doc above); or
765776
# - machine code files are changed
@@ -789,6 +800,7 @@ podman_machine_task:
789800
podman_machine_aarch64_task:
790801
name: *std_name_fmt
791802
alias: podman_machine_aarch64
803+
skip: true # Temporarily disabled
792804
only_if: *only_if_machine_test
793805
depends_on: *build
794806
ec2_instance:
@@ -826,19 +838,16 @@ podman_machine_windows_task:
826838
# everywhere to do so here it would mean we would need duplicate the
827839
# full big only_if condition which is more difficult to maintain so
828840
# use the skip here.
829-
skip: *skip_rhel_release
830841
depends_on: *build
831842
ec2_instance:
832843
<<: *windows
833844
type: z1d.metal
834845
platform: windows
835-
timeout_in: 60m
846+
timeout_in: 90m
836847
env: *winenv
837848
matrix:
838849
- env:
839850
TEST_FLAVOR: "machine-wsl"
840-
- env:
841-
TEST_FLAVOR: "machine-hyperv"
842851
clone_script: *winclone
843852
# This depends on an instance with an local NVMe storage so we can make use of fast IO
844853
# Our machine tests are IO bound so this is rather imporant to speed them up a lot.
@@ -870,8 +879,8 @@ podman_machine_windows_task:
870879
podman_machine_mac_task:
871880
name: *std_name_fmt
872881
alias: podman_machine_mac
882+
skip: true # Temporarily disabled
873883
only_if: *only_if_machine_test
874-
skip: *skip_rhel_release
875884
depends_on: *build
876885
persistent_worker: *mac_pw
877886
timeout_in: 60m
@@ -918,6 +927,7 @@ podman_machine_mac_task:
918927
local_system_test_task: &local_system_test_task
919928
name: *std_name_fmt
920929
alias: local_system_test
930+
skip: true # Temporarily disabled
921931
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
922932
# only when: - main rules (see doc above); or
923933
# - sys test code is changed; or
@@ -943,6 +953,7 @@ local_system_test_task: &local_system_test_task
943953
local_system_test_aarch64_task: &local_system_test_task_aarch64
944954
name: *std_name_fmt
945955
alias: local_system_test_aarch64
956+
skip: true # Temporarily disabled
946957
# Docs: ./contrib/cirrus/CIModes.md
947958
only_if: *only_if_system_test
948959
depends_on: *build
@@ -961,6 +972,7 @@ local_system_test_aarch64_task: &local_system_test_task_aarch64
961972
remote_system_test_task:
962973
<<: *local_system_test_task
963974
alias: remote_system_test
975+
skip: true # Temporarily disabled
964976
env:
965977
TEST_FLAVOR: sys
966978
PODBIN_NAME: remote
@@ -969,12 +981,14 @@ remote_system_test_task:
969981
remote_system_test_aarch64_task:
970982
<<: *local_system_test_task_aarch64
971983
alias: remote_system_test_aarch64
984+
skip: true # Temporarily disabled
972985
env:
973986
TEST_FLAVOR: sys
974987
PODBIN_NAME: remote
975988

976989

977990
rootless_remote_system_test_task:
991+
skip: true # Temporarily disabled
978992
matrix:
979993
# Minimal sanity testing: only the latest Fedora
980994
- env:
@@ -995,6 +1009,7 @@ rootless_remote_system_test_task:
9951009
rootless_system_test_task:
9961010
name: *std_name_fmt
9971011
alias: rootless_system_test
1012+
skip: true # Temporarily disabled
9981013
# Docs: ./contrib/cirrus/CIModes.md
9991014
only_if: *only_if_system_test
10001015
depends_on: *build
@@ -1013,6 +1028,7 @@ rootless_system_test_task:
10131028
farm_test_task:
10141029
name: *std_name_fmt
10151030
alias: farm_test
1031+
skip: true # Temporarily disabled
10161032
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
10171033
# only when: - main rules (see doc above); or
10181034
# - farm test code is changed or one of the shared helper import files from the system test; or
@@ -1037,6 +1053,7 @@ farm_test_task:
10371053
buildah_bud_test_task:
10381054
name: *std_name_fmt
10391055
alias: buildah_bud_test
1056+
skip: true # Temporarily disabled
10401057
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
10411058
# only when: - main rules (see doc above); or
10421059
# - podman build source code files or bud tests files are changed
@@ -1064,6 +1081,7 @@ buildah_bud_test_task:
10641081
upgrade_test_task:
10651082
name: "Upgrade test: from $PODMAN_UPGRADE_FROM"
10661083
alias: upgrade_test
1084+
skip: true # Temporarily disabled
10671085
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
10681086
# only when: - main rules (see doc above); or
10691087
# - upgrade test code is changed or one of the shared helper import files from the system test; or
@@ -1103,6 +1121,7 @@ upgrade_test_task:
11031121
meta_task:
11041122
name: "VM img. keepalive"
11051123
alias: meta
1124+
skip: true # Temporarily disabled
11061125
container:
11071126
cpu: 2
11081127
memory: 2
@@ -1135,6 +1154,7 @@ success_task:
11351154
# Ref: https://github.com/openshift/release/pull/48855
11361155
name: "Total Success"
11371156
alias: success
1157+
skip: true # Temporarily disabled
11381158
# N/B: ALL tasks must be listed here, minus their '_task' suffix.
11391159
depends_on:
11401160
- build_success
@@ -1176,6 +1196,7 @@ success_task:
11761196
artifacts_task:
11771197
name: "Artifacts"
11781198
alias: artifacts
1199+
skip: true # Temporarily disabled
11791200
# Docs: ./contrib/cirrus/CIModes.md
11801201
only_if: *no_rhel_release
11811202
depends_on:
@@ -1225,6 +1246,7 @@ artifacts_task:
12251246
release_task:
12261247
name: "Verify Release"
12271248
alias: release
1249+
skip: true # Temporarily disabled
12281250
# This should _only_ run for new tags
12291251
# Docs: ./contrib/cirrus/CIModes.md
12301252
only_if: $CIRRUS_TAG != ''
@@ -1249,6 +1271,7 @@ release_task:
12491271
release_test_task:
12501272
name: "Optional Release Test"
12511273
alias: release_test
1274+
skip: true # Temporarily disabled
12521275
# Release-PRs always include "release" or "Bump" in the title
12531276
# Docs: ./contrib/cirrus/CIModes.md
12541277
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)