From 00d876d18ca942732aee8e98bf2bc2b2fff224b2 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Thu, 21 Apr 2022 09:28:31 +0200 Subject: [PATCH] cirrus: disable integration tasks They are too flaky on this stable branch. The system tests are sufficient to pass gating. Signed-off-by: Valentin Rothberg --- .cirrus.yml | 167 ++++++++++++++++++++++++++-------------------------- 1 file changed, 82 insertions(+), 85 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 060f0dc8d7..37d32aa329 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -441,93 +441,93 @@ apiv2_test_task: # Execute the podman integration tests on all primary platforms and release # versions, as root, without involving the podman-remote client. -local_integration_test_task: &local_integration_test_task - # Integration-test task name convention: - # - name: &std_name_fmt "$TEST_FLAVOR $PODBIN_NAME $DISTRO_NV $PRIV_NAME $TEST_ENVIRON" - alias: local_integration_test - only_if: *not_docs - skip: *branches_and_tags - depends_on: - - unit_test - matrix: *platform_axis - gce_instance: *standardvm - timeout_in: 90m - env: - TEST_FLAVOR: int - clone_script: *noop # Comes from cache - gopath_cache: *ro_gopath_cache - setup_script: *setup - main_script: *main - always: &int_logs_artifacts - <<: *logs_artifacts - ginkgo_node_logs_artifacts: - path: ./test/e2e/ginkgo-node-*.log - type: text/plain +#local_integration_test_task: &local_integration_test_task +# # Integration-test task name convention: +# # +# name: &std_name_fmt "$TEST_FLAVOR $PODBIN_NAME $DISTRO_NV $PRIV_NAME $TEST_ENVIRON" +# alias: local_integration_test +# only_if: *not_docs +# skip: *branches_and_tags +# depends_on: +# - unit_test +# matrix: *platform_axis +# gce_instance: *standardvm +# timeout_in: 90m +# env: +# TEST_FLAVOR: int +# clone_script: *noop # Comes from cache +# gopath_cache: *ro_gopath_cache +# setup_script: *setup +# main_script: *main +# always: &int_logs_artifacts +# <<: *logs_artifacts +# ginkgo_node_logs_artifacts: +# path: ./test/e2e/ginkgo-node-*.log +# type: text/plain # Nearly identical to `local_integration_test` except all operations # are performed through the podman-remote client vs a podman "server" # running on the same host. -remote_integration_test_task: - <<: *local_integration_test_task - alias: remote_integration_test - env: - TEST_FLAVOR: int - PODBIN_NAME: remote +#remote_integration_test_task: +# <<: *local_integration_test_task +# alias: remote_integration_test +# env: +# TEST_FLAVOR: int +# PODBIN_NAME: remote # Run the complete set of integration tests from inside a container. # This verifies all/most operations function with "podman-in-podman". -container_integration_test_task: - name: *std_name_fmt - alias: container_integration_test - only_if: *not_docs - skip: *branches_and_tags - depends_on: - - unit_test - matrix: &fedora_vm_axis - - env: - DISTRO_NV: ${FEDORA_NAME} - _BUILD_CACHE_HANDLE: ${FEDORA_NAME}-build-${CIRRUS_BUILD_ID} - VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} - CTR_FQIN: ${FEDORA_CONTAINER_FQIN} - - env: - DISTRO_NV: ${PRIOR_FEDORA_NAME} - _BUILD_CACHE_HANDLE: ${PRIOR_FEDORA_NAME}-build-${CIRRUS_BUILD_ID} - VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} - CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} - gce_instance: *standardvm - timeout_in: 90m - env: - TEST_FLAVOR: int - TEST_ENVIRON: container - clone_script: *noop # Comes from cache - gopath_cache: *ro_gopath_cache - setup_script: *setup - main_script: *main - always: *int_logs_artifacts +#container_integration_test_task: +# name: *std_name_fmt +# alias: container_integration_test +# only_if: *not_docs +# skip: *branches_and_tags +# depends_on: +# - unit_test +# matrix: &fedora_vm_axis +# - env: +# DISTRO_NV: ${FEDORA_NAME} +# _BUILD_CACHE_HANDLE: ${FEDORA_NAME}-build-${CIRRUS_BUILD_ID} +# VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} +# CTR_FQIN: ${FEDORA_CONTAINER_FQIN} +# - env: +# DISTRO_NV: ${PRIOR_FEDORA_NAME} +# _BUILD_CACHE_HANDLE: ${PRIOR_FEDORA_NAME}-build-${CIRRUS_BUILD_ID} +# VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} +# CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} +# gce_instance: *standardvm +# timeout_in: 90m +# env: +# TEST_FLAVOR: int +# TEST_ENVIRON: container +# clone_script: *noop # Comes from cache +# gopath_cache: *ro_gopath_cache +# setup_script: *setup +# main_script: *main +# always: *int_logs_artifacts # Execute most integration tests as a regular (non-root) user. -rootless_integration_test_task: - name: *std_name_fmt - alias: rootless_integration_test - only_if: *not_docs - skip: *branches_and_tags - depends_on: - - unit_test - matrix: *platform_axis - gce_instance: *standardvm - timeout_in: 90m - env: - TEST_FLAVOR: int - PRIV_NAME: rootless - clone_script: *noop # Comes from cache - gopath_cache: *ro_gopath_cache - setup_script: *setup - main_script: *main - always: *int_logs_artifacts +#rootless_integration_test_task: +# name: *std_name_fmt +# alias: rootless_integration_test +# only_if: *not_docs +# skip: *branches_and_tags +# depends_on: +# - unit_test +# matrix: *platform_axis +# gce_instance: *standardvm +# timeout_in: 90m +# env: +# TEST_FLAVOR: int +# PRIV_NAME: rootless +# clone_script: *noop # Comes from cache +# gopath_cache: *ro_gopath_cache +# setup_script: *setup +# main_script: *main +# always: *int_logs_artifacts # Always run subsequent to integration tests. While parallelism is lost @@ -535,12 +535,12 @@ rootless_integration_test_task: # for some golang developers. Otherwise the following tasks run across # the same matrix as the integration-tests (above). local_system_test_task: &local_system_test_task - name: *std_name_fmt + name: &std_name_fmt "$TEST_FLAVOR $PODBIN_NAME $DISTRO_NV $PRIV_NAME $TEST_ENVIRON" alias: local_system_test skip: *tags only_if: *not_docs depends_on: - - local_integration_test + - unit_test matrix: *platform_axis gce_instance: *standardvm env: @@ -556,7 +556,7 @@ remote_system_test_task: <<: *local_system_test_task alias: remote_system_test depends_on: - - remote_integration_test + - unit_test env: TEST_FLAVOR: sys PODBIN_NAME: remote @@ -567,7 +567,7 @@ buildah_bud_test_task: skip: *tags only_if: *not_docs depends_on: - - local_integration_test + - unit_test env: TEST_FLAVOR: bud DISTRO_NV: ${FEDORA_NAME} @@ -583,7 +583,8 @@ buildah_bud_test_task: gopath_cache: *ro_gopath_cache setup_script: *setup main_script: *main - always: *int_logs_artifacts + always: &int_logs_artifacts + <<: *logs_artifacts rootless_system_test_task: name: *std_name_fmt @@ -591,7 +592,7 @@ rootless_system_test_task: skip: *tags only_if: *not_docs depends_on: - - rootless_integration_test + - unit_test matrix: *platform_axis gce_instance: *standardvm env: @@ -683,10 +684,6 @@ success_task: - docker-py_test - unit_test - apiv2_test - - local_integration_test - - remote_integration_test - - rootless_integration_test - - container_integration_test - local_system_test - remote_system_test - rootless_system_test