Remove unsed functions

Use TM export path and kubeconfig path
Reuse test-infra util functions
Additional minor fixes

.test-defs/allE2eTestgrid.yaml

@@ -41,5 +41,9 @@ spec:
     value: 'fast,slow'
 
   command: [bash, -c]
-  args: go run $GOPATH/src/github.com/gardener/test-infra/test/e2etest
+  args:
+  - >-
+    export E2E_EXPORT_PATH=$TM_EXPORT_PATH
+    export E2E_KUBECONFIG_PATH=$TM_KUBECONFIG_PATH
+    go run $GOPATH/src/github.com/gardener/test-infra/test/e2etest
   image: eu.gcr.io/gardener-project/gardener/testmachinery/base-step

.test-defs/conformanceTestgrid.yaml

@@ -16,9 +16,9 @@ kind: TestDefinition
 metadata:
   name: testgrid
 spec:
-  owner: DL_5C5BE3E2970B9F404D0E2F50@sap.com
+  owner: gardener-oq@listserv.sap.com
   recipientsOnFailure:
-  - DL_5C5BE3E2970B9F404D0E2F50@sap.com
+  - gardener-oq@listserv.sap.com
 
   description: Run kubernetes conformance tests and push result files (e2e.log and junit_01.xml) to testgrid repository.
 
@@ -44,5 +44,9 @@ spec:
     value: "false"
 
   command: [bash, -c]
-  args: go run $GOPATH/src/github.com/gardener/test-infra/test/e2etest
+  args:
+  - >-
+    export E2E_EXPORT_PATH=$TM_EXPORT_PATH
+    export E2E_KUBECONFIG_PATH=$TM_KUBECONFIG_PATH
+    go run $GOPATH/src/github.com/gardener/test-infra/test/e2etest
   image: eu.gcr.io/gardener-project/gardener/testmachinery/base-step

.test-defs/e2eFast.yaml

@@ -26,10 +26,14 @@ spec:
   labels: ["default"]
 
   config:
-  - type: env
-    name: TESTCASE_GROUPS
-    value: 'fast'
+    - type: env
+      name: TESTCASE_GROUPS
+      value: 'fast'
 
   command: [bash, -c]
-  args: go run $GOPATH/src/github.com/gardener/test-infra/test/e2etest
+  args:
+  - >-
+    export E2E_EXPORT_PATH=$TM_EXPORT_PATH
+    export E2E_KUBECONFIG_PATH=$TM_KUBECONFIG_PATH
+    go run $GOPATH/src/github.com/gardener/test-infra/test/e2etest
   image: eu.gcr.io/gardener-project/gardener/testmachinery/base-step

.test-defs/e2eSlow.yaml

@@ -32,5 +32,9 @@ spec:
       value: 'slow'
 
   command: [bash, -c]
-  args: go run $GOPATH/src/github.com/gardener/test-infra/test/e2etest
+  args:
+  - >-
+    export E2E_EXPORT_PATH=$TM_EXPORT_PATH
+    export E2E_KUBECONFIG_PATH=$TM_KUBECONFIG_PATH
+    go run $GOPATH/src/github.com/gardener/test-infra/test/e2etest
   image: eu.gcr.io/gardener-project/gardener/testmachinery/base-step

test/e2etest/README.md

@@ -24,14 +24,15 @@ Ensure all required environment variables have been set. Create a `shoot.config`
 | TESTCASE_GROUPS |  | **[Required]** testcases groups to run (comma separated). E.g. `fast,slow` |
 | CLOUDPROVIDER |  | **[Required]** Cloud provider (supported: aws, gcp, azure, alicloud, openstack) |
 | DESCRIPTION_FILE | working.json | Path to description json file, which lists the testcases to run |
-| EXPORT_PATH  | /tmp/e2e/export  | Location of `shoot.config` file and test results |
+| E2E_EXPORT_PATH  | /tmp/e2e/export  | Location of `shoot.config` file and test results |
 | GINKGO_PARALLEL | true | Whether to run kubetest in parallel way. Testcases that consist of the `[Serial] tag are executed serially. |
 | IGNORE_FALSE_POSITIVE_LIST | false | Ignores exclusion of testcases that are listed in `false_positive.json` |
 | IGNORE_SKIP_LIST | false | Ignores exclusion of testcases that are listed in `skip.json`  |
 | INCLUDE_UNTRACKED_TESTS | false | Executes testcases that are not mentioned in description files for given provider and kubernetes release version |
 | FLAKE_ATTEMPTS | 2 | Flake attempts for kubetest: how many time a failed test should be rerun |
 | PUBLISH_RESULTS_TO_TESTGRID | false | Whether to push test results to google cloud storage, for testgrid |
 | RETEST_FLAGGED_ONLY | false | Runs testcases with retest flag only. Value of `DESCRIPTION_FILE` is ignored |
+| E2E_KUBECONFIG_PATH | $E2E_EXPORT_PATH | Dir of `shoot.config` file |
 
 ### Description Files
 Example:

test/e2etest/config/config.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/gardener/test-infra/test/e2etest/util"
+	tiutil "github.com/gardener/test-infra/pkg/util"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"os"
@@ -56,8 +56,8 @@ func init() {
 	if GoPath == "" {
 		log.Fatal("GOPATH environment variable not found")
 	}
-	GardenerVersion = util.GetEnv("GARDENER_VERSION", "")
-	ExportPath = util.GetEnv("EXPORT_PATH", path.Join(TmpDir, "export"))
+	GardenerVersion = tiutil.Getenv("GARDENER_VERSION", "")
+	ExportPath = tiutil.Getenv("E2E_EXPORT_PATH", path.Join(TmpDir, "export"))
 	if _, err := os.Stat(ExportPath); os.IsNotExist(err) {
 		if err := os.MkdirAll(ExportPath, os.FileMode(0777)); err != nil {
 			log.Fatal(err)
@@ -67,12 +67,12 @@ func init() {
 	K8sRoot = filepath.Join(GoPath, "src/k8s.io")
 	KubernetesPath = filepath.Join(K8sRoot, "kubernetes")
 	TestInfraPath = filepath.Join(K8sRoot, "test-infra")
-	ShootKubeconfigPath = filepath.Join(ExportPath, "shoot.config")
+	ShootKubeconfigPath = tiutil.Getenv("E2E_KUBECONFIG_PATH", filepath.Join(ExportPath, "shoot.config"))
 	if _, err := os.Stat(ShootKubeconfigPath); err != nil {
 		log.Fatal(errors.Wrapf(err, "file %s does not exist: ", ShootKubeconfigPath))
 	}
-	GinkgoParallel, _ = strconv.ParseBool(util.GetEnv("GINKGO_PARALLEL", "true"))
-	DescriptionFile = util.GetEnv("DESCRIPTION_FILE", WORKING_DESC_FILE)
+	GinkgoParallel = tiutil.GetenvBool("GINKGO_PARALLEL", true)
+	DescriptionFile = tiutil.Getenv("DESCRIPTION_FILE", WORKING_DESC_FILE)
 	K8sRelease = os.Getenv("K8S_VERSION")
 	if K8sRelease == "" {
 		log.Fatal("K8S_VERSION environment variable not found")
@@ -86,18 +86,18 @@ func init() {
 	if CloudProvider == "" {
 		log.Fatal("CLOUDPROVIDER environment variable not found")
 	}
-	IgnoreFalsePositiveList, _ = strconv.ParseBool(util.GetEnv("IGNORE_FALSE_POSITIVE_LIST", "false"))
-	IncludeUntrackedTests, _ = strconv.ParseBool(util.GetEnv("INCLUDE_UNTRACKED_TESTS", "false"))
+	IgnoreFalsePositiveList = tiutil.GetenvBool("IGNORE_FALSE_POSITIVE_LIST", false)
+	IncludeUntrackedTests = tiutil.GetenvBool("INCLUDE_UNTRACKED_TESTS", false)
 	K8sReleaseMajorMinor = string(regexp.MustCompile(`^(\d+\.\d+)`).FindSubmatch([]byte(K8sRelease))[1])
 	DescriptionsPath = path.Join(OwnDir, "kubetest", "description", K8sReleaseMajorMinor)
 	DescriptionFilePath = path.Join(DescriptionsPath, DescriptionFile)
 	if _, err := os.Stat(DescriptionFilePath); err != nil {
 		log.Fatal(errors.Wrapf(err, "file %s does not exist: ", DescriptionFilePath))
 	}
-	FlakeAttempts, _ = strconv.Atoi(util.GetEnv("FLAKE_ATTEMPTS", "2"))
-	PublishResultsToTestgrid, _ = strconv.ParseBool(util.GetEnv("PUBLISH_RESULTS_TO_TESTGRID", "false"))
-	IgnoreSkipList, _ = strconv.ParseBool(util.GetEnv("IGNORE_SKIP_LIST", "false"))
-	RetestFlaggedOnly, _ = strconv.ParseBool(util.GetEnv("RETEST_FLAGGED_ONLY", "false"))
+	FlakeAttempts, _ = strconv.Atoi(tiutil.Getenv("FLAKE_ATTEMPTS", "2"))
+	PublishResultsToTestgrid = tiutil.GetenvBool("PUBLISH_RESULTS_TO_TESTGRID", false)
+	IgnoreSkipList = tiutil.GetenvBool("IGNORE_SKIP_LIST", false)
+	RetestFlaggedOnly = tiutil.GetenvBool("RETEST_FLAGGED_ONLY", false)
 
 	log.Debugf("GoPath: %s", GoPath)
 	log.Debugf("K8sRoot: %s", K8sRoot)

test/e2etest/kubetest/kubetest_runner.go

@@ -27,11 +27,9 @@ const (
 )
 
 func init() {
-	kubectlPath, err := exec.Command("which", "kubectl").Output()
-	if err != nil {
-		log.Fatal(errors.Wrapf(err, "kubectl command unknown"))
-	}
-	if err = os.Setenv("KUBECTL_PATH", strings.TrimSpace(string(kubectlPath))); err != nil {
+	var err error
+	kubectlPath, _ := exec.Command("which", "kubectl").Output() // error is checked in previous steps
+	if err := os.Setenv("KUBECTL_PATH", strings.TrimSpace(string(kubectlPath))); err != nil {
 		log.Fatal(errors.Wrapf(err, "Couldn't set environment variable KUBECTL_PATH"))
 	}
 	log.Debugf("KUBECTL_PATH: '%s'", os.Getenv("KUBECTL_PATH"))

test/e2etest/kubetest/results_evaluator.go

@@ -35,25 +35,30 @@ var MergedE2eLogFilePath = filepath.Join(config.ExportPath, MergedE2eLogFile)
 func Analyze(kubetestResultsPath string) Summary {
 	log.Info("Analyze e2e.log and junit.xml files")
 	e2eLogFilePaths := util.GetFilesByPattern(kubetestResultsPath, E2eLogFileNamePattern)
-	summary := analyzeE2eLogs(e2eLogFilePaths)
+	summary, err := analyzeE2eLogs(e2eLogFilePaths)
+	if err != nil {
+		log.Fatal(errors.Wrapf(err, "results analysis failed at e2e.log analysis"))
+	}
 	junitXMLFilePaths := util.GetFilesByPattern(kubetestResultsPath, JunitXmlFileNamePattern)
-	analyzeJunitXMLs(junitXMLFilePaths, summary.TestsuiteDuration)
+	if err := analyzeJunitXMLs(junitXMLFilePaths, summary.TestsuiteDuration); err != nil {
+		log.Fatal(errors.Wrapf(err, "results analysis failed at junit.xml analysis"))
+	}
 	log.Infof("Check out result files in %s", kubetestResultsPath)
 	return summary
 }
 
-func analyzeJunitXMLs(junitXMLFilePaths []string, durationSec int) {
+func analyzeJunitXMLs(junitXMLFilePaths []string, durationSec int) error {
 	var mergedJunitXmlResult = &JunitXMLResult{FailedTests: 0, ExecutedTests: 0, DurationFloat: 0, SuccessfulTests: 0, DurationInt: durationSec}
 	testcaseNameToTestcase := make(map[string]TestcaseResult)
 	for _, junitXMLPath := range junitXMLFilePaths {
 		file, err := os.Open(junitXMLPath)
 		if err != nil {
-			log.Fatal(err)
+			return err
 		}
 		defer file.Close()
 		junitXml, err := UnmarshalJunitXMLResult(file.Name())
 		if err != nil {
-			log.Fatal(errors.Wrapf(err, "Couldn't unmarshal %s", file.Name()))
+			return errors.Wrapf(err, "Couldn't unmarshal %s", file.Name())
 		}
 		mergedJunitXmlResult.FailedTests += junitXml.FailedTests
 		mergedJunitXmlResult.ExecutedTests += junitXml.ExecutedTests
@@ -68,38 +73,42 @@ func analyzeJunitXMLs(junitXMLFilePaths []string, durationSec int) {
 			testcaseNameToTestcase[testcase.Name] = testcase
 			testcaseJSON, err := json.MarshalIndent(testcase, "", " ")
 			if err != nil {
-				log.Fatal(errors.Wrapf(err, "Couldn't marshal testsuite summary %s", testcaseJSON))
+				return errors.Wrapf(err, "Couldn't marshal testsuite summary %s", testcaseJSON)
 			}
 
 			jsonFileName := fmt.Sprintf("test-%s.json", strconv.FormatInt(time.Now().UnixNano(), 10))
 			testcaseJsonFilePath := path.Join(config.ExportPath, jsonFileName)
 			if err := ioutil.WriteFile(testcaseJsonFilePath, testcaseJSON, 0644); err != nil {
-				log.Fatal(errors.Wrapf(err, "Couldn't write %s to file", testcaseJsonFilePath))
+				return errors.Wrapf(err, "Couldn't write %s to file", testcaseJsonFilePath)
 			}
 		}
 	}
 	for _, testcase := range testcaseNameToTestcase {
 		mergedJunitXmlResult.Testcases = append(mergedJunitXmlResult.Testcases, testcase)
 	}
-	saveJunitXmlToFile(mergedJunitXmlResult)
+	if err := saveJunitXmlToFile(mergedJunitXmlResult); err != nil {
+		return err
+	}
+	return nil
 }
 
-func saveJunitXmlToFile(mergedJunitXmlResult *JunitXMLResult) {
+func saveJunitXmlToFile(mergedJunitXmlResult *JunitXMLResult) error {
 	output, err := xml.MarshalIndent(mergedJunitXmlResult, "  ", "    ")
 	if err != nil {
-		fmt.Printf("error: %v\n", err)
+		return err
 	}
 	output = append([]byte(xml.Header), output...)
 
 	file, _ := os.Create(mergedJunitXmlFilePath)
 	defer file.Close()
 	if _, err = file.Write(output); err != nil {
-		log.Fatal(err)
+		return err
 	}
+	return nil
 }
 
-func analyzeE2eLogs(e2eLogFilePaths []string) Summary {
-	summary := Summary{TestsuiteSuccessful: false, FailedTestcases: 0, SuccessfulTestcases: 0, ExecutedTestcases: 0, TestsuiteDuration: 0, FlakedTestcases: 0, DescriptionFile: config.DescriptionFile, Flaked: false}
+func analyzeE2eLogs(e2eLogFilePaths []string) (Summary, error) {
+	summary := Summary{DescriptionFile: config.DescriptionFile}
 	regexpRanSpecs := regexp.MustCompile(`Ran (?P<TestcasesRan>\d+).*Specs.in (?P<TestSuiteDuration>\d+)`)
 	regexpPassedFailed := regexp.MustCompile(`(?P<Passed>\d+) Passed.*(?P<Failed>\d+) Failed.*Pending`)
 
@@ -114,17 +123,26 @@ func analyzeE2eLogs(e2eLogFilePaths []string) Summary {
 		for scanner.Scan() {
 			if regexpRanSpecs.MatchString(scanner.Text()) {
 				groupToValue, _ := util.GetGroupMapOfRegexMatches(regexpRanSpecs, scanner.Text())
-				summary.ExecutedTestcases += util.SilentStrToInt(groupToValue["TestcasesRan"])
-				summary.TestsuiteDuration += util.SilentStrToInt(groupToValue["TestSuiteDuration"])
+				groupToValueInt, err := convertValuesToInt(groupToValue)
+				if err != nil {
+					return summary, errors.Errorf("Empty or non integer values in map, for regexp %s", regexpRanSpecs.String())
+				}
+				summary.ExecutedTestcases += groupToValueInt["TestcasesRan"]
+				summary.TestsuiteDuration += groupToValueInt["TestSuiteDuration"]
 			}
 			if regexpPassedFailed.MatchString(scanner.Text()) {
 				groupToValue, _ := util.GetGroupMapOfRegexMatches(regexpPassedFailed, scanner.Text())
-				summary.SuccessfulTestcases += util.SilentStrToInt(groupToValue["Passed"])
-				summary.FailedTestcases += util.SilentStrToInt(groupToValue["Failed"])
+				groupToValueInt, err := convertValuesToInt(groupToValue)
+				if err != nil {
+					return summary, errors.Errorf("Empty or non integer values in map, for regexp %s", regexpRanSpecs.String())
+				}
+				summary.SuccessfulTestcases += groupToValueInt["Passed"]
+				summary.FailedTestcases += groupToValueInt["Failed"]
 				summary.TestsuiteSuccessful = summary.FailedTestcases == 0
 			}
 		}
 
+		//TODO
 		summary.Flaked = summary.FlakedTestcases != 0
 	}
 	summary.ExecutionGroup = strings.Join(config.TestcaseGroup, ",")
@@ -142,7 +160,24 @@ func analyzeE2eLogs(e2eLogFilePaths []string) Summary {
 	}
 
 	mergeE2eLogFiles(MergedE2eLogFilePath, e2eLogFilePaths)
-	return summary
+	return summary, nil
+}
+
+func convertValuesToInt(m map[string]string) (map[string]int, error) {
+	convertedMap := make(map[string]int, len(m))
+	first := true
+	for key, value := range m {
+		if first {
+			first = false
+			continue // first element is always the whole match
+		}
+		convertedValue, err := strconv.Atoi(value)
+		if err != nil {
+			return nil, err
+		}
+		convertedMap[key] = convertedValue
+	}
+	return convertedMap, nil
 }
 
 func mergeE2eLogFiles(dst string, e2eLogFilePaths []string) {

test/e2etest/kubetest/setup/setup.go

@@ -6,9 +6,11 @@ import (
 	"github.com/gardener/test-infra/test/e2etest/kubetest"
 	"github.com/gardener/test-infra/test/e2etest/util"
 	"github.com/mholt/archiver"
+	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"net/http"
 	"os"
+	"os/exec"
 	"path"
 	"path/filepath"
 	"runtime"
@@ -50,6 +52,9 @@ func cleanUpPreviousRuns() {
 
 func areTestUtilitiesReady() bool {
 	log.Info("checking whether any test utility is not ready")
+	if _, err := exec.Command("which", "kubectl").Output(); err != nil {
+		log.Fatal(errors.Wrapf(err, "kubectl command unknown"))
+	}
 	e2eTestPath := path.Join(k8sOutputBinDir, "e2e.test")
 	if _, err := os.Stat(e2eTestPath); os.IsNotExist(err) {
 		log.Infof("test utility not ready: %s", e2eTestPath)

test/e2etest/kubetest/xml_junit_result.go

@@ -39,23 +39,23 @@ type JunitXMLResult struct {
 	ExecutedTests   int              `xml:"tests,attr"`
 	FailedTests     int              `xml:"failures,attr"`
 	DurationFloat   float32          `xml:"time,attr"`
-	DurationInt     int              `xml:"-"`
 	Testcases       []TestcaseResult `xml:"testcase"`
-	SuccessfulTests int              `xml:"-"`
+	DurationInt     int              `xml:"-"` // calculated
+	SuccessfulTests int              `xml:"-"` // calculated
 }
 
 type TestcaseResult struct {
 	XMLName        xml.Name  `xml:"testcase" json:"-"`
 	Name           string    `xml:"name,attr" json:"name"`
-	Status         string    `xml:"-" json:"status"`
+	Status         string    `xml:"-" json:"status"` // calculated
 	SkippedRaw     *struct{} `xml:"skipped" json:"-"`
-	Skipped        bool      `xml:"-" json:"-"`
+	Skipped        bool      `xml:"-" json:"-"` // calculated
 	FailureText    string    `xml:"failure,omitempty" json:"failure.text,omitempty"`
 	SystemOutput   string    `xml:"system-out,omitempty" json:"system-out,omitempty"`
 	DurationFloat  float32   `xml:"time,attr" json:"-"`
-	DurationInt    int       `xml:"-" json:"duration"`
-	SigGroup       string    `xml:"-" json:"sig"`
-	TestDesc       string    `xml:"-" json:"test_desc_file"`
-	ExecutionGroup string    `xml:"-" json:"execution_group"`
-	Successful     bool      `xml:"-" json:"successful"`
+	DurationInt    int       `xml:"-" json:"duration"`        // calculated
+	SigGroup       string    `xml:"-" json:"sig"`             // calculated
+	TestDesc       string    `xml:"-" json:"test_desc_file"`  // calculated
+	ExecutionGroup string    `xml:"-" json:"execution_group"` // calculated
+	Successful     bool      `xml:"-" json:"successful"`      // calculated
 }