summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Baude <bbaude@redhat.com>2020-04-16 16:43:52 -0500
committerBrent Baude <bbaude@redhat.com>2020-04-17 10:09:32 -0500
commitb6a264464f005eaf8670b22a820aa1db150c188f (patch)
tree48b3fa6c7ad58a31ac838b581decaa031e7044b2
parentd31dcb9bbd521fe8e3e78b0ebe2a893634ab2e6b (diff)
downloadpodman-b6a264464f005eaf8670b22a820aa1db150c188f.tar.gz
podman-b6a264464f005eaf8670b22a820aa1db150c188f.tar.bz2
podman-b6a264464f005eaf8670b22a820aa1db150c188f.zip
Enable some testing
Signed-off-by: Brent Baude <bbaude@redhat.com>
-rw-r--r--.cirrus.yml6
-rw-r--r--cmd/podman/root.go2
2 files changed, 5 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index d8b0a3bf9..e96994cfe 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -382,7 +382,6 @@ image_prune_task:
# This task does the unit and integration testing for every platform
testing_task:
- skip: $CI == 'true'
alias: "testing"
depends_on:
- "gating"
@@ -391,6 +390,8 @@ testing_task:
- "build_each_commit"
- "build_without_cgo"
+ allow_failures: $CI == 'true'
+
# Only test build cache-images, if that's what's requested
only_if: >-
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
@@ -427,7 +428,8 @@ 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}'
- integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} integration_test'
+ # FIXME
+ #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'
diff --git a/cmd/podman/root.go b/cmd/podman/root.go
index 729ca6aa7..667f7e588 100644
--- a/cmd/podman/root.go
+++ b/cmd/podman/root.go
@@ -82,7 +82,7 @@ func init() {
func Execute() {
if err := rootCmd.ExecuteContext(registry.GetContextWithOptions()); err != nil {
- logrus.Error(err)
+ fmt.Fprintln(os.Stderr, "Error:", err.Error())
} else if registry.GetExitCode() == registry.ExecErrorCodeGeneric {
// The exitCode modified from registry.ExecErrorCodeGeneric,
// indicates an application