Merge pull request #5855 from baude/v2t1

Enable some testing

.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'
 

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