Propagates error from preflight in the claim file even if preflight f…

…ails to run due to connectivity issues, missing docker config, etc...

cnf-certification-test/lifecycle/podrecreation/podrecreation.go

@@ -19,10 +19,10 @@ package podrecreation
 import (
 	"context"
 	"fmt"
+	"os"
 	"sync"
 	"time"
 
-	"github.com/onsi/ginkgo/v2"
 	"github.com/sirupsen/logrus"
 	"github.com/test-network-function/cnf-certification-test/internal/clientsholder"
 	"github.com/test-network-function/cnf-certification-test/pkg/provider"
@@ -144,7 +144,7 @@ func CordonCleanup(node string) {
 	err := CordonHelper(node, Uncordon)
 	if err != nil {
 		logrus.Errorf("cleanup: error uncordoning the node: %s, err=%s", node, err)
-		ginkgo.AbortSuite(fmt.Sprintf("cleanup: error uncordoning the node: %s, err=%s", node, err))
+		os.Exit(1)
 	}
 }
 

cnf-certification-test/preflight/suite.go

@@ -17,6 +17,7 @@
 package preflight
 
 import (
+	"fmt"
 	"strings"
 
 	plibRuntime "github.com/redhat-openshift-ecosystem/openshift-preflight/certification"
@@ -57,6 +58,7 @@ func labelsAllowTestRun(labelFilter string, allowedLabels []string) bool {
 // time to finish. When they're finished, a checksdb.Check is created for each preflight lib's
 // check that has run. The CheckFn will simply store the result.
 func ShouldRun(labelsExpr string) bool {
+	env = provider.GetTestEnvironment()
 	preflightAllowedLabels := []string{common.PreflightTestKey, identifiers.TagPreflight}
 
 	if !labelsAllowTestRun(labelsExpr, preflightAllowedLabels) {
@@ -67,7 +69,7 @@ func ShouldRun(labelsExpr string) bool {
 	preflightDockerConfigFile := configuration.GetTestParameters().PfltDockerconfig
 	if preflightDockerConfigFile == "" || preflightDockerConfigFile == "NA" {
 		logrus.Warn("Skipping the preflight suite because the Docker Config file is not provided.")
-		return false
+		env.SkipPreflight = true
 	}
 
 	return true
@@ -169,7 +171,7 @@ func generatePreflightContainerGinkgoTest(checksGroup *checksdb.ChecksGroup, tes
 				}
 				for _, r := range cut.PreflightResults.Errors {
 					if r.Name() == testName {
-						nonCompliantObjects = append(nonCompliantObjects, testhelper.NewContainerReportObject(cut.Namespace, cut.Podname, cut.Name, "Container has errored preflight test "+testName, false))
+						nonCompliantObjects = append(nonCompliantObjects, testhelper.NewContainerReportObject(cut.Namespace, cut.Podname, cut.Name, fmt.Sprintf("Container has errored preflight test %s, err=%v", testName, r.Err), false))
 						tnf.Logf(logrus.ErrorLevel, "%s has errored preflight test: %s", cut, testName)
 					}
 				}

pkg/provider/containers.go

@@ -120,11 +120,20 @@ func (c *Container) SetPreflightResults(preflightImageCache map[string]plibRunti
 	ctx = logr.NewContext(ctx, logger)
 
 	check := plibContainer.NewCheck(c.Image, opts...)
+
 	results, runtimeErr := check.Run(ctx)
 	logrus.StandardLogger().Out = os.Stderr
 	if runtimeErr != nil {
-		logrus.Error(runtimeErr)
-		return runtimeErr
+		_, checks, err := check.List(ctx)
+		if err != nil {
+			return fmt.Errorf("could not get preflight container test list")
+		}
+
+		results.TestedImage = c.Image
+		for _, c := range checks {
+			results.PassedOverall = false
+			results.Errors = append(results.Errors, plibRuntime.Result{Check: c, ElapsedTime: 0, Err: runtimeErr})
+		}
 	}
 
 	// Take all of the preflight logs and stick them into logrus.

pkg/provider/operators.go

@@ -99,10 +99,18 @@ func (op *Operator) SetPreflightResults(env *TestEnvironment) error {
 	ctx = logr.NewContext(ctx, logger)
 
 	check := plibOperator.NewCheck(bundleImage, indexImage, oc.KubeConfig, opts...)
+
 	results, runtimeErr := check.Run(ctx)
+	logrus.StandardLogger().Out = os.Stderr
 	if runtimeErr != nil {
-		logrus.Error(runtimeErr)
-		return runtimeErr
+		_, checks, err := check.List(ctx)
+		if err != nil {
+			return fmt.Errorf("could not get preflight container test list")
+		}
+		for _, c := range checks {
+			results.PassedOverall = false
+			results.Errors = append(results.Errors, plibRuntime.Result{Check: c, ElapsedTime: 0, Err: runtimeErr})
+		}
 	}
 
 	// Take all of the preflight logs and stick them into logrus.

pkg/provider/provider.go

@@ -121,6 +121,7 @@ type TestEnvironment struct { // rename this with testTarget
 	ExecutedBy             string
 	PartnerName            string
 	CollectorAppPassword   string
+	SkipPreflight          bool
 }
 
 type MachineConfig struct {