Skip to content

Commit 796f7be

Browse files
l0rdl0rd
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 796f7be

File tree

9 files changed

+130
-50
lines changed

9 files changed

+130
-50
lines changed

‎.cirrus.yml‎

Lines changed: 51 additions & 25 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"
@@ -198,6 +199,7 @@ build_task:
198199
build_aarch64_task:
199200
alias: 'build_aarch64'
200201
name: 'Build for $DISTRO_NV'
202+
skip: true # Temporarily disabled
201203
ec2_instance: &standard_build_ec2_aarch64
202204
image: ${VM_IMAGE_NAME}
203205
type: ${EC2_INST_TYPE}
@@ -238,22 +240,22 @@ alt_build_task:
238240
TEST_FLAVOR: "altbuild"
239241
gce_instance: *fastvm
240242
matrix:
241-
- env:
242-
ALT_NAME: 'Build Each Commit'
243+
# - env:
244+
# ALT_NAME: 'Build Each Commit'
243245
- env:
244246
# TODO: Replace with task using `winmake` to build
245247
# binary and archive installation zip file.
246248
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'
249+
# - env:
250+
# ALT_NAME: 'Alt Arch. x86 Cross'
251+
# - env:
252+
# ALT_NAME: 'Alt Arch. ARM Cross'
253+
# - env:
254+
# ALT_NAME: 'Alt Arch. MIPS Cross'
255+
# - env:
256+
# ALT_NAME: 'Alt Arch. MIPS64 Cross'
257+
# - env:
258+
# ALT_NAME: 'Alt Arch. Other Cross'
257259
# This task cannot make use of the shared repo.tar.zst artifact.
258260
clone_script: *full_clone
259261
setup_script: *setup
@@ -267,6 +269,7 @@ alt_build_task:
267269
# Confirm building the remote client, natively on a Mac OS-X VM.
268270
osx_alt_build_task:
269271
name: "Build for MacOS amd64+arm64" # N/B: Referenced by URLencoded strings elsewhere
272+
skip: true # Temporarily disabled
270273
alias: osx_alt_build
271274
# Docs: ./contrib/cirrus/CIModes.md
272275
only_if: *no_rhel_release # RHEL never releases podman mac installer binary
@@ -318,6 +321,7 @@ osx_alt_build_task:
318321
freebsd_alt_build_task:
319322
name: "FreeBSD Cross"
320323
alias: freebsd_alt_build
324+
skip: true # Temporarily disabled
321325
# Only run on 'main' and PRs against 'main'
322326
# Docs: ./contrib/cirrus/CIModes.md
323327
only_if: $CIRRUS_BRANCH == 'main' || $CIRRUS_BASE_BRANCH == 'main'
@@ -359,11 +363,11 @@ build_success_task:
359363
alias: build_success
360364
depends_on:
361365
- validate-source
362-
- build
363-
- build_aarch64
366+
# - build
367+
# - build_aarch64
364368
- alt_build
365-
- osx_alt_build
366-
- freebsd_alt_build
369+
# - osx_alt_build
370+
# - freebsd_alt_build
367371
env:
368372
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
369373
container: &smallcontainer
@@ -381,6 +385,7 @@ build_success_task:
381385
bindings_task:
382386
name: "Test Bindings"
383387
alias: bindings
388+
skip: true # Temporarily disabled
384389
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
385390
# only when: - main rules (see doc above); or
386391
# - bindings test code is changed; or
@@ -431,6 +436,7 @@ bindings_task:
431436
swagger_task:
432437
name: "Test Swagger"
433438
alias: swagger
439+
skip: true # Temporarily disabled
434440
depends_on: *build
435441
gce_instance: *standardvm
436442
env:
@@ -452,6 +458,7 @@ swagger_task:
452458

453459
win_installer_task:
454460
name: "Verify Win Installer Build"
461+
skip: true # Temporarily disabled
455462
matrix:
456463
- env:
457464
CONTAINERS_MACHINE_PROVIDER: 'wsl'
@@ -517,6 +524,7 @@ win_installer_task:
517524
docker-py_test_task:
518525
name: Docker-py Compat.
519526
alias: docker-py_test
527+
skip: true # Temporarily disabled
520528
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
521529
# only when: - main rules (see doc above); or
522530
# - docker-py test code is changed; or
@@ -543,6 +551,7 @@ docker-py_test_task:
543551
unit_test_task:
544552
name: "Unit tests on $DISTRO_NV"
545553
alias: unit_test
554+
skip: true # Temporarily disabled
546555
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
547556
# only when: - main rules (see doc above); or
548557
# - unit test files are changed (contains a false positves such as test/e2e/
@@ -574,6 +583,7 @@ unit_test_task:
574583
unit_test_windows_task:
575584
name: "Unit tests on Windows"
576585
alias: unit_test_windows
586+
skip: true # Temporarily disabled
577587
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
578588
# only when: - main rules (see doc above); or
579589
# - unit test files are changed (contains a false positves such as test/e2e/
@@ -591,9 +601,6 @@ unit_test_windows_task:
591601
# everywhere to do so here it would mean we would need duplicate the
592602
# full big only_if condition which is more difficult to maintain so
593603
# use the skip here.
594-
skip: &skip_rhel_release |
595-
$CIRRUS_BRANCH =~ 'v[0-9\.]+-rhel' ||
596-
$CIRRUS_BASE_BRANCH =~ 'v[0-9\.]+-rhel'
597604
depends_on: *build
598605
ec2_instance: *windows
599606
timeout_in: 20m
@@ -612,6 +619,7 @@ unit_test_windows_task:
612619
apiv2_test_task:
613620
name: "APIv2 test on $DISTRO_NV ($PRIV_NAME)"
614621
alias: apiv2_test
622+
skip: true # Temporarily disabled
615623
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
616624
# only when: - main rules (see doc above); or
617625
# - apiv2 test code is changed; or
@@ -641,6 +649,7 @@ apiv2_test_task:
641649
compose_test_task:
642650
name: "$TEST_FLAVOR test on $DISTRO_NV ($PRIV_NAME)"
643651
alias: compose_test
652+
skip: true # Temporarily disabled
644653
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
645654
# only when: - main rules (see doc above); or
646655
# - compose test code is changed; or
@@ -673,6 +682,7 @@ local_integration_test_task: &local_integration_test_task
673682
# <int.|sys.> <podman|remote> <Distro NV> <root|rootless>
674683
name: &std_name_fmt "$TEST_FLAVOR $PODBIN_NAME $DISTRO_NV $PRIV_NAME $TEST_ENVIRON ${CI_DESIRED_DATABASE}"
675684
alias: local_integration_test
685+
skip: true # Temporarily disabled
676686
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
677687
# only when: - main rules (see doc above); or
678688
# - int test code is changed; or
@@ -706,6 +716,7 @@ local_integration_test_task: &local_integration_test_task
706716
remote_integration_test_task:
707717
<<: *local_integration_test_task
708718
alias: remote_integration_test
719+
skip: true # Temporarily disabled
709720
env:
710721
TEST_FLAVOR: int
711722
PODBIN_NAME: remote
@@ -716,6 +727,7 @@ remote_integration_test_task:
716727
container_integration_test_task:
717728
name: *std_name_fmt
718729
alias: container_integration_test
730+
skip: true # Temporarily disabled
719731
# Docs: ./contrib/cirrus/CIModes.md
720732
only_if: *only_if_int_test
721733
depends_on: *build
@@ -743,6 +755,7 @@ container_integration_test_task:
743755
rootless_integration_test_task:
744756
name: *std_name_fmt
745757
alias: rootless_integration_test
758+
skip: true # Temporarily disabled
746759
# Docs: ./contrib/cirrus/CIModes.md
747760
only_if: *only_if_int_test
748761
depends_on: *build
@@ -760,6 +773,7 @@ rootless_integration_test_task:
760773
podman_machine_task:
761774
name: *std_name_fmt
762775
alias: podman_machine
776+
skip: true # Temporarily disabled
763777
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
764778
# only when: - main rules (see doc above); or
765779
# - machine code files are changed
@@ -789,6 +803,7 @@ podman_machine_task:
789803
podman_machine_aarch64_task:
790804
name: *std_name_fmt
791805
alias: podman_machine_aarch64
806+
skip: true # Temporarily disabled
792807
only_if: *only_if_machine_test
793808
depends_on: *build
794809
ec2_instance:
@@ -826,19 +841,16 @@ podman_machine_windows_task:
826841
# everywhere to do so here it would mean we would need duplicate the
827842
# full big only_if condition which is more difficult to maintain so
828843
# use the skip here.
829-
skip: *skip_rhel_release
830844
depends_on: *build
831845
ec2_instance:
832846
<<: *windows
833847
type: z1d.metal
834848
platform: windows
835-
timeout_in: 60m
849+
timeout_in: 120m
836850
env: *winenv
837851
matrix:
838852
- env:
839853
TEST_FLAVOR: "machine-wsl"
840-
- env:
841-
TEST_FLAVOR: "machine-hyperv"
842854
clone_script: *winclone
843855
# This depends on an instance with an local NVMe storage so we can make use of fast IO
844856
# Our machine tests are IO bound so this is rather imporant to speed them up a lot.
@@ -860,7 +872,7 @@ podman_machine_windows_task:
860872
main_script: ".\\repo\\contrib\\cirrus\\win-podman-machine-main.ps1"
861873
always:
862874
wsl_logs_artifacts:
863-
path: ./*.zip
875+
path: ./*.7z
864876
# Required for `contrib/cirrus/logformatter` to work properly
865877
html_artifacts:
866878
path: ./*.html
@@ -870,8 +882,8 @@ podman_machine_windows_task:
870882
podman_machine_mac_task:
871883
name: *std_name_fmt
872884
alias: podman_machine_mac
885+
skip: true # Temporarily disabled
873886
only_if: *only_if_machine_test
874-
skip: *skip_rhel_release
875887
depends_on: *build
876888
persistent_worker: *mac_pw
877889
timeout_in: 60m
@@ -918,6 +930,7 @@ podman_machine_mac_task:
918930
local_system_test_task: &local_system_test_task
919931
name: *std_name_fmt
920932
alias: local_system_test
933+
skip: true # Temporarily disabled
921934
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
922935
# only when: - main rules (see doc above); or
923936
# - sys test code is changed; or
@@ -943,6 +956,7 @@ local_system_test_task: &local_system_test_task
943956
local_system_test_aarch64_task: &local_system_test_task_aarch64
944957
name: *std_name_fmt
945958
alias: local_system_test_aarch64
959+
skip: true # Temporarily disabled
946960
# Docs: ./contrib/cirrus/CIModes.md
947961
only_if: *only_if_system_test
948962
depends_on: *build
@@ -961,6 +975,7 @@ local_system_test_aarch64_task: &local_system_test_task_aarch64
961975
remote_system_test_task:
962976
<<: *local_system_test_task
963977
alias: remote_system_test
978+
skip: true # Temporarily disabled
964979
env:
965980
TEST_FLAVOR: sys
966981
PODBIN_NAME: remote
@@ -969,12 +984,14 @@ remote_system_test_task:
969984
remote_system_test_aarch64_task:
970985
<<: *local_system_test_task_aarch64
971986
alias: remote_system_test_aarch64
987+
skip: true # Temporarily disabled
972988
env:
973989
TEST_FLAVOR: sys
974990
PODBIN_NAME: remote
975991

976992

977993
rootless_remote_system_test_task:
994+
skip: true # Temporarily disabled
978995
matrix:
979996
# Minimal sanity testing: only the latest Fedora
980997
- env:
@@ -995,6 +1012,7 @@ rootless_remote_system_test_task:
9951012
rootless_system_test_task:
9961013
name: *std_name_fmt
9971014
alias: rootless_system_test
1015+
skip: true # Temporarily disabled
9981016
# Docs: ./contrib/cirrus/CIModes.md
9991017
only_if: *only_if_system_test
10001018
depends_on: *build
@@ -1013,6 +1031,7 @@ rootless_system_test_task:
10131031
farm_test_task:
10141032
name: *std_name_fmt
10151033
alias: farm_test
1034+
skip: true # Temporarily disabled
10161035
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
10171036
# only when: - main rules (see doc above); or
10181037
# - farm test code is changed or one of the shared helper import files from the system test; or
@@ -1037,6 +1056,7 @@ farm_test_task:
10371056
buildah_bud_test_task:
10381057
name: *std_name_fmt
10391058
alias: buildah_bud_test
1059+
skip: true # Temporarily disabled
10401060
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
10411061
# only when: - main rules (see doc above); or
10421062
# - podman build source code files or bud tests files are changed
@@ -1064,6 +1084,7 @@ buildah_bud_test_task:
10641084
upgrade_test_task:
10651085
name: "Upgrade test: from $PODMAN_UPGRADE_FROM"
10661086
alias: upgrade_test
1087+
skip: true # Temporarily disabled
10671088
# Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
10681089
# only when: - main rules (see doc above); or
10691090
# - upgrade test code is changed or one of the shared helper import files from the system test; or
@@ -1103,6 +1124,7 @@ upgrade_test_task:
11031124
meta_task:
11041125
name: "VM img. keepalive"
11051126
alias: meta
1127+
skip: true # Temporarily disabled
11061128
container:
11071129
cpu: 2
11081130
memory: 2
@@ -1135,6 +1157,7 @@ success_task:
11351157
# Ref: https://github.com/openshift/release/pull/48855
11361158
name: "Total Success"
11371159
alias: success
1160+
skip: true # Temporarily disabled
11381161
# N/B: ALL tasks must be listed here, minus their '_task' suffix.
11391162
depends_on:
11401163
- build_success
@@ -1176,6 +1199,7 @@ success_task:
11761199
artifacts_task:
11771200
name: "Artifacts"
11781201
alias: artifacts
1202+
skip: true # Temporarily disabled
11791203
# Docs: ./contrib/cirrus/CIModes.md
11801204
only_if: *no_rhel_release
11811205
depends_on:
@@ -1225,6 +1249,7 @@ artifacts_task:
12251249
release_task:
12261250
name: "Verify Release"
12271251
alias: release
1252+
skip: true # Temporarily disabled
12281253
# This should _only_ run for new tags
12291254
# Docs: ./contrib/cirrus/CIModes.md
12301255
only_if: $CIRRUS_TAG != ''
@@ -1249,6 +1274,7 @@ release_task:
12491274
release_test_task:
12501275
name: "Optional Release Test"
12511276
alias: release_test
1277+
skip: true # Temporarily disabled
12521278
# Release-PRs always include "release" or "Bump" in the title
12531279
# Docs: ./contrib/cirrus/CIModes.md
12541280
only_if: $CIRRUS_CHANGE_TITLE =~ '.*((release)|(bump)).*'

0 commit comments

Comments
 (0)