Remove unneccessary env variables in test-defs and adjust readme.md

gardener · Jun 25, 2019 · 537cc7c · 537cc7c
1 parent d668a03
commit 537cc7c
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 13 deletions.
diff --git a/.test-defs/allE2eTestgrid.yaml b/.test-defs/allE2eTestgrid.yaml
@@ -39,9 +39,6 @@ spec:
   - type: env
     name: TESTCASE_GROUPS
     value: 'fast,slow'
-  - type: env
-    name: DESCRIPTION_FILE
-    value: "working.json"
 
   command: [bash, -c]
   args: go run $GOPATH/src/github.com/gardener/test-infra/test/e2etest

diff --git a/.test-defs/conformanceTestgrid.yaml b/.test-defs/conformanceTestgrid.yaml
@@ -42,9 +42,6 @@ spec:
   - type: env
     name: GINKGO_PARALLEL
     value: "false"
-  - type: env
-    name: DESCRIPTION_FILE
-    value: "working.json"
 
   command: [bash, -c]
   args: go run $GOPATH/src/github.com/gardener/test-infra/test/e2etest

diff --git a/.test-defs/e2eFast.yaml b/.test-defs/e2eFast.yaml
@@ -29,9 +29,6 @@ spec:
   - type: env
     name: TESTCASE_GROUPS
     value: 'fast'
-  - type: env
-    name: DESCRIPTION_FILE
-    value: "working.json"
 
   command: [bash, -c]
   args: go run $GOPATH/src/github.com/gardener/test-infra/test/e2etest

diff --git a/.test-defs/e2eSlow.yaml b/.test-defs/e2eSlow.yaml
@@ -30,9 +30,6 @@ spec:
     - type: env
       name: TESTCASE_GROUPS
       value: 'slow'
-    - type: env
-      name: DESCRIPTION_FILE
-      value: "working.json"
 
   command: [bash, -c]
   args: go run $GOPATH/src/github.com/gardener/test-infra/test/e2etest

diff --git a/test/e2etest/README.md b/test/e2etest/README.md
@@ -20,10 +20,10 @@ Ensure all required environment variables have been set. Create a `shoot.config`
 
 | Environment Variable  | Default | Description  |
 |---|---|---|
-| DESCRIPTION_FILE |  | **[Required]** Path to description json file, which lists the testcases to run |
 | K8S_VERSION |  | **[Required]** Kubernetes cluster version |
 | 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 |
 | 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` |

diff --git a/test/e2etest/kubetest/results_evaluator.go b/test/e2etest/kubetest/results_evaluator.go
@@ -38,6 +38,7 @@ func Analyze(kubetestResultsPath string) Summary {
 	summary := analyzeE2eLogs(e2eLogFilePaths)
 	junitXMLFilePaths := util.GetFilesByPattern(kubetestResultsPath, JunitXmlFileNamePattern)
 	analyzeJunitXMLs(junitXMLFilePaths, summary.TestsuiteDuration)
+	log.Infof("Check out result files in %s", kubetestResultsPath)
 	return summary
 }