summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-05-22 06:20:21 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-05-22 09:41:28 -0400
commit9883bf7e68aefae1266b92d4ad8c75ed02060f2b (patch)
treeda8ec8aae25972a786da420d8cc543cbc4fadf3f
parentd6cee18273810a21c96f4161956676d78155b45a (diff)
downloadpodman-9883bf7e68aefae1266b92d4ad8c75ed02060f2b.tar.gz
podman-9883bf7e68aefae1266b92d4ad8c75ed02060f2b.tar.bz2
podman-9883bf7e68aefae1266b92d4ad8c75ed02060f2b.zip
Attempt to turn on integration tests
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
-rw-r--r--.cirrus.yml97
1 files changed, 4 insertions, 93 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 04b31b1e0..ba8d16803 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -440,10 +440,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'
@@ -451,8 +450,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'
@@ -476,90 +474,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:
@@ -859,9 +773,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"