diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-17 11:39:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 11:39:02 -0400 |
| commit | f8f5d9cef79aa98fa4b0b7261d3192bcdf880e3c (patch) | |
| tree | 263db854d84c7cb21f581283170304f28689965f | |
| parent | 454fc9fecd75f8e5cd9819739de876c121f5989d (diff) | |
| parent | b6a264464f005eaf8670b22a820aa1db150c188f (diff) | |
| download | podman-f8f5d9cef79aa98fa4b0b7261d3192bcdf880e3c.tar.gz podman-f8f5d9cef79aa98fa4b0b7261d3192bcdf880e3c.tar.bz2 podman-f8f5d9cef79aa98fa4b0b7261d3192bcdf880e3c.zip | |
Merge pull request #5855 from baude/v2t1
Enable some testing
| -rw-r--r-- | .cirrus.yml | 6 | ||||
| -rw-r--r-- | cmd/podman/root.go | 2 |
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 |