DNM: debugging only

.cirrus.yml

@@ -357,7 +357,7 @@
 # Status aggregator for all builds.  This task simply makes dependency
 # management easier, and results in a simpler graph that using YAML
 # anchors/aliases.
 build_success_task:
     name: "Total Build Success"
     alias: build_success
     depends_on:
@@ -453,69 +453,6 @@
             type: text/plain
 
 
-win_installer_task:
-    name: "Verify Win Installer Build"
-    matrix:
-      - env:
-            CONTAINERS_MACHINE_PROVIDER: 'wsl'
-      - env:
-            CONTAINERS_MACHINE_PROVIDER: 'hyperv'
-    alias: win_installer
-    only_if: *no_rhel_release
-    depends_on: *build
-    ec2_instance: &windows
-        image: "${WINDOWS_AMI}"
-        type: m5.large
-        region: us-east-1
-        platform: windows
-    env: &winenv
-        CIRRUS_WORKING_DIR: &wincwd "${LOCALAPPDATA}\\cirrus-ci-build"
-        CIRRUS_SHELL: powershell
-        PATH: "${PATH};C:\\ProgramData\\chocolatey\\bin"
-        DISTRO_NV: "windows"
-        PRIV_NAME: "rootless"
-        # Fake version, we are only testing the installer functions, so version doesn't matter
-        WIN_INST_VER: 9.9.9
-    # It's HIGHLY desireable to use the same binary throughout CI.  Otherwise, if
-    # there's a toolchain or build-environment specific problem, it can be incredibly
-    # difficult (and non-obvious) to debug.
-    clone_script: &winclone |
-        $ErrorActionPreference = 'Stop'
-        $ProgressPreference = 'SilentlyContinue'
-        New-Item -ItemType Directory -Force -Path "$ENV:CIRRUS_WORKING_DIR"
-        Set-Location "$ENV:CIRRUS_WORKING_DIR"
-        $uri = "${ENV:ART_URL}/Windows Cross/repo/repo.tar.zst"
-        Write-Host "Downloading $uri"
-        For($i = 0;;) {
-            Try {
-                Invoke-WebRequest -UseBasicParsing -ErrorAction Stop -OutFile "repo.tar.zst" `
-                  -Uri "$uri"
-                Break
-            } Catch {
-                if (++$i -gt 6) {
-                    throw $_.Exception
-                }
-                Write-Host "Download failed - retrying:" $_.Exception.Response.StatusCode
-                Start-Sleep -Seconds 10
-            }
-        }
-        Write-Host "zstd -d repo.tar.zst"
-        zstd -d repo.tar.zst
-        if ($LASTEXITCODE -ne 0) {
-            throw "Extract repo.tar.zst failed"
-            Exit 1
-        }
-        Write-Host "arc unarchive repo.tar .\"
-        arc unarchive repo.tar .\repo
-        if ($LASTEXITCODE -ne 0) {
-            throw "Unarchive repo.tar failed"
-            Exit 1
-        }
-        Get-ChildItem -Path .
-        Get-ChildItem -Path .\repo
-    main_script: ".\\repo\\contrib\\cirrus\\win-installer-main.ps1"
-
-
 # Verify podman is compatible with the docker python-module.
 docker-py_test_task:
     name: Docker-py Compat.
@@ -541,135 +478,6 @@
     main_script: *main
     always: *runner_stats
 
-
-# Does exactly what it says, execute the podman unit-tests on Fedora.
-unit_test_task:
-    name: "Unit tests on $DISTRO_NV"
-    alias: unit_test
-    # Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
-    # only when: - main rules (see doc above); or
-    #            - unit test files are changed (contains a false positves such as test/e2e/
-    #              but that should not be an issue, it only runs when it doesn't have to)
-    #            - actual source code changed
-    only_if: >-
-        $CIRRUS_PR == '' ||
-        $CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
-        changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'test/tools/**', 'test/registries*.conf', 'hack/**', 'version/rawversion/*') ||
-        changesInclude('**/*_test.go') ||
-        (changesInclude('**/*.go', '**/*.c', '**/*.h') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
-    depends_on: *build
-    matrix:
-        - env: *stdenvars
-        # Special-case: Rootless on latest Fedora (standard) VM
-        - name: "Rootless unit on $DISTRO_NV"
-          env:
-              <<: *stdenvars
-              PRIV_NAME: rootless
-    gce_instance: *standardvm
-    env:
-        TEST_FLAVOR: unit
-    clone_script: *get_gosrc
-    setup_script: *setup
-    main_script: *main
-    always: *logs_artifacts
-
-
-unit_test_windows_task:
-    name: "Unit tests on Windows"
-    alias: unit_test_windows
-    # Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
-    # only when: - main rules (see doc above); or
-    #            - unit test files are changed (contains a false positves such as test/e2e/
-    #              but that should not be an issue, it only runs when it doesn't have to)
-    #            - actual source code changed
-    only_if: >-
-        $CIRRUS_PR == '' ||
-        $CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
-        changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'test/tools/**', 'test/registries*.conf', 'hack/**', 'version/rawversion/*') ||
-        changesInclude('winmake.ps1') ||
-        changesInclude('**/*_test.go') ||
-        (changesInclude('**/*.go', '**/*.c', '**/*.h') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
-    # Special case, we do not run macos/windows builds on rhel branches.
-    # Thus the machine task should not be run too, while we use only_if
-    # everywhere to do so here it would mean we would need duplicate the
-    # full big only_if condition which is more difficult to maintain so
-    # use the skip here.
-    skip: &skip_rhel_release |
-        $CIRRUS_BRANCH =~ 'v[0-9\.]+-rhel' ||
-        $CIRRUS_BASE_BRANCH =~ 'v[0-9\.]+-rhel'
-    depends_on: *build
-    ec2_instance: *windows
-    timeout_in: 20m
-    env:
-         <<: *winenv
-         TEST_FLAVOR: unit
-    clone_script: *winclone
-    main_script: ".\\repo\\contrib\\cirrus\\win-unit-main.ps1"
-    always:
-        # Required for `contrib/cirrus/logformatter` to work properly
-        html_artifacts:
-            path: ./*.html
-            type: text/html
-
-
-apiv2_test_task:
-    name: "APIv2 test on $DISTRO_NV ($PRIV_NAME)"
-    alias: apiv2_test
-    # Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
-    # only when: - main rules (see doc above); or
-    #            - apiv2 test code is changed; or
-    #            - actual source code changed
-    only_if: >-
-        $CIRRUS_PR == '' ||
-        $CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
-        changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'test/tools/**', 'test/registries*.conf', 'hack/**', 'version/rawversion/*') ||
-        changesInclude('test/apiv2/**', 'test/python/**') ||
-        (changesInclude('**/*.go', '**/*.c', '**/*.h') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
-    depends_on: *build
-    gce_instance: *standardvm
-    env:
-        <<: *stdenvars
-        TEST_FLAVOR: apiv2
-    matrix:
-      - env:
-          PRIV_NAME: root
-      - env:
-          PRIV_NAME: rootless
-    clone_script: *get_gosrc
-    setup_script: *setup
-    main_script: *main
-    always: *logs_artifacts
-
-
-compose_test_task:
-    name: "$TEST_FLAVOR test on $DISTRO_NV ($PRIV_NAME)"
-    alias: compose_test
-    # Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
-    # only when: - main rules (see doc above); or
-    #            - compose test code is changed; or
-    #            - actual source code changed
-    only_if: >-
-        $CIRRUS_PR == '' ||
-        $CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
-        changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'test/tools/**', 'test/registries*.conf', 'hack/**', 'version/rawversion/*') ||
-        changesInclude('test/compose/**') ||
-        (changesInclude('**/*.go', '**/*.c', '**/*.h') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
-    depends_on: *build
-    gce_instance: *standardvm
-    matrix:
-      - env:
-            PRIV_NAME: root
-      - env:
-            PRIV_NAME: rootless
-    env:
-        <<: *stdenvars
-        TEST_FLAVOR: compose_v2
-    clone_script: *get_gosrc
-    setup_script: *setup
-    main_script: *main
-    always: *logs_artifacts
-
-
 # versions, as root, without involving the podman-remote client.
 local_integration_test_task: &local_integration_test_task
     # Integration-test task name convention:
@@ -759,155 +567,6 @@
     main_script: *main
     always: *int_logs_artifacts
 
-
-podman_machine_task:
-    name: *std_name_fmt
-    alias: podman_machine
-    # Docs: ./contrib/cirrus/CIModes.md (Cirrus Task contexts and runtime modes)
-    # only when: - main rules (see doc above); or
-    #            - machine code files are changed
-    only_if: &only_if_machine_test >-
-        $CIRRUS_PR == '' ||
-        $CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
-        changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'test/tools/**', 'test/registries*.conf', 'hack/**', 'version/rawversion/*') ||
-        changesInclude('cmd/podman/machine/**', 'pkg/machine/**', '**/*machine*.go')
-    depends_on: *build
-    ec2_instance:
-        image: "${VM_IMAGE_NAME}"
-        type: "${EC2_INST_TYPE}"
-        region: us-east-1
-    timeout_in: 30m
-    env:
-      EC2_INST_TYPE: "m5zn.metal"  # Bare-metal instance is required
-      TEST_FLAVOR: "machine-linux"
-      PRIV_NAME: "rootless"  # intended use-case
-      DISTRO_NV: "${FEDORA_NAME}"
-      VM_IMAGE_NAME: "${FEDORA_AMI}"
-    clone_script: *get_gosrc
-    setup_script: *setup
-    main_script: *main
-    always: *int_logs_artifacts
-
-
-podman_machine_aarch64_task:
-    name: *std_name_fmt
-    alias: podman_machine_aarch64
-    only_if: *only_if_machine_test
-    depends_on: *build
-    ec2_instance:
-        <<: *standard_build_ec2_aarch64
-    timeout_in: 30m
-    env:
-        TEST_FLAVOR: "machine-linux"
-        EC2_INST_TYPE: c6g.metal
-        PRIV_NAME: "rootless"  # intended use-case
-        DISTRO_NV: "${FEDORA_AARCH64_NAME}"
-        VM_IMAGE_NAME: "${FEDORA_AARCH64_AMI}"
-    clone_script: &get_gosrc_aarch64 |
-        cd /tmp
-        echo "$ARTCURL/build_aarch64/repo/repo.tar.zst"
-        time $ARTCURL/build_aarch64/repo/repo.tar.zst
-        time tar -xf /tmp/repo.tar.zst -C $GOSRC
-    setup_script: *setup
-    main_script: *main
-    always: *int_logs_artifacts
-
-
-podman_machine_windows_task:
-    name: *std_name_fmt
-    alias: podman_machine_windows
-    # Docs: ./contrib/cirrus/CIModes.md
-    only_if: *only_if_machine_test
-    # Special case, we do not run macos/windows builds on rhel branches.
-    # Thus the machine task should not be run too, while we use only_if
-    # everywhere to do so here it would mean we would need duplicate the
-    # full big only_if condition which is more difficult to maintain so
-    # use the skip here.
-    skip: *skip_rhel_release
-    depends_on: *build
-    ec2_instance:
-        <<: *windows
-        type: z1d.metal
-        platform: windows
-    timeout_in: 60m
-    env: *winenv
-    matrix:
-      - env:
-          TEST_FLAVOR: "machine-wsl"
-      - env:
-          TEST_FLAVOR: "machine-hyperv"
-    clone_script: *winclone
-    # This depends on an instance with an local NVMe storage so we can make use of fast IO
-    # Our machine tests are IO bound so this is rather imporant to speed them up a lot.
-    setup_disk_script: |
-        echo "Get-Disk"
-        Get-Disk | Ft -autosize | out-string -width 4096
-        # Hard coded to disk 0, assume that this is always the case for our ec2 instance.
-        # It is not clear to me how I would filter by name because we still have two disks
-        # with the same name.
-        echo "Format and mount disk 0"
-        $disk = Get-Disk 0
-        $disk | Initialize-Disk -PartitionStyle MBR
-        $disk | New-Partition -UseMaximumSize -MbrType IFS
-        $Partition = Get-Partition -DiskNumber $disk.Number
-        $Partition | Format-Volume -FileSystem NTFS -Confirm:$false
-        $Partition | Add-PartitionAccessPath -AccessPath "Z:\"
-        echo "Get-Volume"
-        Get-Volume
-    main_script: ".\\repo\\contrib\\cirrus\\win-podman-machine-main.ps1"
-    always:
-        wsl_logs_artifacts:
-            path: ./*.zip
-        # Required for `contrib/cirrus/logformatter` to work properly
-        html_artifacts:
-            path: ./*.html
-            type: text/html
-
-
-podman_machine_mac_task:
-    name: *std_name_fmt
-    alias: podman_machine_mac
-    only_if: *only_if_machine_test
-    skip: *skip_rhel_release
-    depends_on: *build
-    persistent_worker: *mac_pw
-    timeout_in: 60m
-    env:
-        <<: *mac_env
-        DISTRO_NV: "darwin"
-        PRIV_NAME: "rootless"  # intended use-case
-    matrix:
-        - env:
-            # See contrib/cirrus/mac_runner.sh
-            TEST_FLAVOR: "machine-applehv"
-        - env:
-            # See contrib/cirrus/mac_runner.sh
-            TEST_FLAVOR: "machine-libkrun"
-    clone_script:  # artifacts from osx_alt_build_task
-        - mkdir -p $CIRRUS_WORKING_DIR
-        - cd $CIRRUS_WORKING_DIR
-        - $ARTCURL/Build%20for%20MacOS%20amd64%2Barm64/repo/repo.tar.zst
-        - tar -xf repo.tar.zst
-    # This host is/was shared with potentially many other CI tasks.
-    # The previous task may have been canceled or aborted.
-    prep_script: *mac_cleanup
-    setup_script: "contrib/cirrus/mac_setup.sh"
-    env_script: "contrib/cirrus/mac_env.sh"
-    # TODO: Timeout bumped b/c initial image download (~5min) and VM
-    #       resize (~2min) causes test-timeout (90s default).  Should
-    #       tests deal with this internally?
-    test_script:
-        - "contrib/cirrus/mac_runner.sh"
-    # This host is/was shared with potentially many other CI tasks.
-    # Ensure nothing is left running while waiting for the next task.
-    always:
-        # Required for `contrib/cirrus/logformatter` to work properly
-        html_artifacts:
-            path: ./*.html
-            type: text/html
-        task_cleanup_script: *mac_cleanup
-
-
 # Always run subsequent to integration tests.  While parallelism is lost
 # with runtime, debugging system-test failures can be more challenging
 # for some golang developers.  Otherwise the following tasks run across
@@ -949,7 +608,11 @@
         <<: *stdenvars_aarch64
         TEST_FLAVOR: sys
         DISTRO_NV: ${FEDORA_AARCH64_NAME}
-    clone_script: *get_gosrc_aarch64
+    clone_script: &get_gosrc_aarch64 |
+        cd /tmp
+        echo "$ARTCURL/build_aarch64/repo/repo.tar.zst"
+        time $ARTCURL/build_aarch64/repo/repo.tar.zst
+        time tar -xf /tmp/repo.tar.zst -C $GOSRC
     setup_script: *setup
     main_script: *main
     always: *logs_artifacts
@@ -1127,7 +790,7 @@
 
 # Status aggregator for all tests.  This task ensures a defined set of tasks
 # all passed, and allows confirming that based on the status of this task.
 success_task:
     # N/B: The prow merge-bot (tide) is sensitized to this exact name, DO NOT CHANGE IT.
     # Ref: https://github.com/openshift/release/pull/48855
     name: "Total Success"
@@ -1137,20 +800,11 @@
         - build_success
         - bindings
         - swagger
-        - win_installer
         - docker-py_test
-        - unit_test
-        - unit_test_windows
-        - apiv2_test
-        - compose_test
         - local_integration_test
         - remote_integration_test
         - container_integration_test
         - rootless_integration_test
-        - podman_machine
-        - podman_machine_aarch64
-        - podman_machine_windows
-        - podman_machine_mac
         - local_system_test
         - local_system_test_aarch64
         - remote_system_test