diff options
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 118 |
1 files changed, 10 insertions, 108 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index c7817cde8..2de08cf9e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -137,11 +137,9 @@ gating_task: # FIXME #- 'cd $GOSRC && ./hack/podman-commands.sh |& ${TIMESTAMP}' # N/B: need 'clean' so some committed files are re-generated. - # FIXME - #- '/usr/local/bin/entrypoint.sh clean podman-remote |& ${TIMESTAMP}' - #- '/usr/local/bin/entrypoint.sh clean podman xref_helpmsgs_manpages BUILDTAGS="exclude_graphdriver_devicemapper selinux seccomp" |& ${TIMESTAMP}' - # FIXME - #- '/usr/local/bin/entrypoint.sh local-cross |& ${TIMESTAMP}' + - '/usr/local/bin/entrypoint.sh clean podman-remote |& ${TIMESTAMP}' + - '/usr/local/bin/entrypoint.sh clean podman xref_helpmsgs_manpages BUILDTAGS="exclude_graphdriver_devicemapper selinux seccomp" |& ${TIMESTAMP}' + - '/usr/local/bin/entrypoint.sh local-cross |& ${TIMESTAMP}' # Verify some aspects of ci/related scripts ci_script: @@ -186,7 +184,6 @@ container_image_build_task: # source code using contrib/rpm/podman.spec.in rpmbuild_task: - skip: $CI == 'true' only_if: >- $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' && @@ -247,7 +244,6 @@ vendor_task: # whether the git tree is clean. varlink_api_task: - skip: $CI == 'true' only_if: >- $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' @@ -313,8 +309,6 @@ build_each_commit_task: build_without_cgo_task: - skip: $CI == 'true' - depends_on: - "gating" - "vendor" @@ -442,10 +436,9 @@ testing_task: env: ADD_SECOND_PARTITION: 'true' matrix: - # FIXME - #- name: remote - # env: - # TEST_REMOTE_CLIENT: 'true' + - name: remote + env: + TEST_REMOTE_CLIENT: 'true' - name: local env: TEST_REMOTE_CLIENT: 'false' @@ -453,8 +446,7 @@ testing_task: networking_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/networking.sh' setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}' unit_test_script: '$SCRIPT_BASE/unit_test.sh |& ${TIMESTAMP}' - # FIXME - #integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} integration_test' + integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} integration_test' system_test_script: '$SCRIPT_BASE/system_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} system_test' apiv2_test_script: '$SCRIPT_BASE/apiv2_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} apiv2_test' @@ -478,90 +470,6 @@ testing_task: path: "*.log.html" type: "text/html" -# This task only temporary as we creep up on making -# all tests passing for v2. Once all tests pass, we -# should immediately remove this and re-enable the -# testing matrix. -integration_test_temporary_task: - - depends_on: - - "gating" - - "varlink_api" - - "vendor" - - "build_each_commit" - - "build_without_cgo" - - only_if: >- - $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && - $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' - - env: - ADD_SECOND_PARTITION: 'true' - TEST_REMOTE_CLIENT: 'false' - - timeout_in: 60m - - networking_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/networking.sh' - setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}' - integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} integration_test' - - on_failure: - failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh' - - always: - package_versions_script: '$SCRIPT_BASE/logcollector.sh packages' - ginkgo_node_logs_script: '$SCRIPT_BASE/logcollector.sh ginkgo' - df_script: '$SCRIPT_BASE/logcollector.sh df' - audit_log_script: '$SCRIPT_BASE/logcollector.sh audit' - journal_script: '$SCRIPT_BASE/logcollector.sh journal' - varlink_script: '$SCRIPT_BASE/logcollector.sh varlink' - podman_system_info_script: '$SCRIPT_BASE/logcollector.sh podman' - html_artifacts: - path: "*.log.html" - type: "text/html" - -# This task only temporary as we creep up on making -# all tests passing for v2 remote. Once all tests pass, we -# should immediately remove this and re-enable the -# testing matrix. -remote_integration_test_temporary_task: - - depends_on: - - "gating" - - "varlink_api" - - "vendor" - - "build_each_commit" - - "build_without_cgo" - - only_if: >- - $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && - $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' - - env: - ADD_SECOND_PARTITION: 'true' - TEST_REMOTE_CLIENT: 'true' - - timeout_in: 60m - - networking_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/networking.sh' - setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}' - integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} integration_test' - - on_failure: - failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh' - - always: - package_versions_script: '$SCRIPT_BASE/logcollector.sh packages' - ginkgo_node_logs_script: '$SCRIPT_BASE/logcollector.sh ginkgo' - df_script: '$SCRIPT_BASE/logcollector.sh df' - audit_log_script: '$SCRIPT_BASE/logcollector.sh audit' - journal_script: '$SCRIPT_BASE/logcollector.sh journal' - varlink_script: '$SCRIPT_BASE/logcollector.sh varlink' - podman_system_info_script: '$SCRIPT_BASE/logcollector.sh podman' - html_artifacts: - path: "*.log.html" - type: "text/html" - # This task executes tests under unique environments/conditions special_testing_rootless_task: @@ -580,10 +488,9 @@ special_testing_rootless_task: ADD_SECOND_PARTITION: 'true' SPECIALMODE: 'rootless' # See docs matrix: - # FIX ME ... - #- name: remote - # env: - # TEST_REMOTE_CLIENT: 'true' + - name: remote + env: + TEST_REMOTE_CLIENT: 'true' - name: local env: TEST_REMOTE_CLIENT: 'false' @@ -646,7 +553,6 @@ special_testing_in_podman_task: special_testing_cross_task: - skip: $CI == 'true' alias: "special_testing_cross" depends_on: - "gating" @@ -712,7 +618,6 @@ special_testing_bindings_task: special_testing_endpoint_task: - skip: $CI == 'true' depends_on: - "gating" - "varlink_api" @@ -863,9 +768,6 @@ success_task: - "verify_test_built_images" - "docs" - "static_build" - # FIXME remove when all v2 tests pass - - "integration_test_temporary" - - "remote_integration_test_temporary" env: CIRRUS_WORKING_DIR: "/usr/src/libpod" |