rename script name, and some minor fix

Author: jianlinliu

cmd/openshift-tests/openshift-tests.go

@@ -22,7 +22,7 @@ import (
 	collectdiskcertificates "github.com/openshift/origin/pkg/cmd/openshift-tests/collect-disk-certificates"
 	"github.com/openshift/origin/pkg/cmd/openshift-tests/dev"
 	"github.com/openshift/origin/pkg/cmd/openshift-tests/disruption"
-	cluster_health_check "github.com/openshift/origin/pkg/cmd/openshift-tests/health-check"
+	e2e_analysis "github.com/openshift/origin/pkg/cmd/openshift-tests/e2e-analysis"
 	"github.com/openshift/origin/pkg/cmd/openshift-tests/images"
 	"github.com/openshift/origin/pkg/cmd/openshift-tests/list"
 	"github.com/openshift/origin/pkg/cmd/openshift-tests/monitor"
@@ -101,7 +101,7 @@ func main() {
 		monitor.NewMonitorCommand(ioStreams),
 		disruption.NewDisruptionCommand(ioStreams),
 		risk_analysis.NewTestFailureRiskAnalysisCommand(),
-		cluster_health_check.NewTestFailureClusterHealthCheckCommand(),
+		e2e_analysis.NewTestFailureClusterAnalysisCheckCommand(),
 		run_resource_watch.NewRunResourceWatchCommand(),
 		timeline.NewTimelineCommand(ioStreams),
 		run_disruption.NewRunInClusterDisruptionMonitorCommand(ioStreams),

pkg/cmd/openshift-tests/e2e-analysis/command.go

@@ -0,0 +1,31 @@
+package e2e_analysis
+
+import (
+	e2eanalysis "github.com/openshift/origin/pkg/e2eanalysis"
+	"github.com/spf13/cobra"
+	"k8s.io/kubectl/pkg/util/templates"
+)
+
+func NewTestFailureClusterAnalysisCheckCommand() *cobra.Command {
+	e2eAnalysisOpts := &e2eanalysis.Options{}
+
+	cmd := &cobra.Command{
+		Use:   "e2e-analysis",
+		Short: "Performs analysis against the cluster",
+		Long: templates.LongDesc(`
+Check cluster health and run some e2e analyisis, including:
+all machines should be in Running state;
+all nodes should be ready;
+ready node count should match or exceed running machine count;
+operators health ordered by dependency;
+and so on.`),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return e2eAnalysisOpts.Run()
+		},
+	}
+	cmd.Flags().StringVar(&e2eAnalysisOpts.JUnitDir,
+		"junit-dir", e2eAnalysisOpts.JUnitDir,
+		"The directory where test reports were written in junit xml format.")
+
+	return cmd
+}

pkg/cmd/openshift-tests/health-check/command.go

@@ -1,4 +1,4 @@
-package health_check
+package e2e_analysis
 
 import (
 	"context"
@@ -29,7 +29,7 @@ type Options struct {
 	JUnitDir string
 }
 
-// Konwn dependency mapping
+// Known dependency mapping
 // key: operator name
 // value: the depenent operators required by the operator
 var operatorDependencies = map[string][]string{
@@ -106,7 +106,7 @@ func (tm *TestManager) GenerateReport(opt *Options) error {
 	}
 	fmt.Println(string(out))
 	if opt.JUnitDir != "" {
-		filePrefix := "cluster-health-check"
+		filePrefix := "junit_e2e_analysis"
 		start := time.Now()
 		timeSuffix := fmt.Sprintf("_%s", start.UTC().Format("20060102-150405"))
 		path := filepath.Join(opt.JUnitDir, fmt.Sprintf("%s_%s.xml", filePrefix, timeSuffix))
@@ -121,7 +121,7 @@ func (opt *Options) Run() error {
 	tm := NewTestManager()
 	defer tm.GenerateReport(opt)
 
-	tcName := "Verify the cluster can be connected"
+	tcName := "verify the cluster can be connected"
 	tc := NewTestCase(tcName)
 	cfg, err := e2e.LoadConfig()
 	if err != nil {
@@ -152,7 +152,11 @@ func (opt *Options) Run() error {
 		return nil
 	}
 	if err != nil {
+		failureMsg := fmt.Sprintf("cluster version stability check failed: %v", err)
+		tm.AddTestCase(tc, failureMsg, "")
 		logrus.Warnf("Continue though cluster version stability check failed (%v)", err)
+	} else {
+		tm.AddTestCase(tc, "", "")
 	}
 
 	// ======================================================
@@ -273,6 +277,9 @@ func (opt *Options) Run() error {
 			failureMsg = fmt.Sprintf("Operator %q - Available=%s, Degraded=%s, Progressing=%s", opName, available, degraded, progressing)
 			logrus.Infof("%s", failureMsg)
 			tm.AddTestCase(tc, failureMsg, "")
+			// add a flake case in here to begin with, so that we can analyze new tests without causing job failures.
+			// once we verify stability we can remove the flake
+			tm.AddTestCase(tc, "", "")
 			failedOperators[opName] = true
 		}
 	}

pkg/health-check/cmd.go pkg/e2eanalysis/e2e_analysis.gopkg/health-check/cmd.go renamed to pkg/e2eanalysis/e2e_analysis.go

@@ -1,4 +1,4 @@
-package health_check
+package e2e_analysis
 
 import (
 	"testing"