s/JUNIT_REPORT_FOLDER/JUNIT_REPORT_DIR/g

eksctl-io · Jan 21, 2019 · 7996107 · 7996107
1 parent a31aa45
commit 7996107
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -29,8 +29,8 @@ COPY . $EKSCTL
 ARG COVERALLS_TOKEN
 ENV COVERALLS_TOKEN $COVERALLS_TOKEN
 
-ENV JUNIT_REPORT_FOLDER $GOPATH/src/github.com/weaveworks/eksctl/test-results/ginkgo
-RUN mkdir -p "${JUNIT_REPORT_FOLDER}"
+ENV JUNIT_REPORT_DIR $GOPATH/src/github.com/weaveworks/eksctl/test-results/ginkgo
+RUN mkdir -p "${JUNIT_REPORT_DIR}"
 
 WORKDIR $EKSCTL
 RUN make test

diff --git a/Makefile b/Makefile
@@ -104,8 +104,8 @@ EKSCTL_IMAGE_BUILD_ARGS := --build-arg=EKSCTL_BUILD_IMAGE=$(EKSCTL_BUILD_IMAGE)
 ifneq ($(COVERALLS_TOKEN),)
 EKSCTL_IMAGE_BUILD_ARGS += --build-arg=COVERALLS_TOKEN=$(COVERALLS_TOKEN)
 endif
-ifneq ($(JUNIT_REPORT_FOLDER),)
-EKSCTL_IMAGE_BUILD_ARGS += --build-arg=JUNIT_REPORT_FOLDER=$(JUNIT_REPORT_FOLDER)
+ifneq ($(JUNIT_REPORT_DIR),)
+EKSCTL_IMAGE_BUILD_ARGS += --build-arg=JUNIT_REPORT_DIR=$(JUNIT_REPORT_DIR)
 endif
 
 

diff --git a/pkg/testutils/ginkgo.go b/pkg/testutils/ginkgo.go
@@ -17,7 +17,7 @@ import (
 func RegisterAndRun(t *testing.T) {
 	_, suitePath, _, _ := runtime.Caller(1)
 	RegisterFailHandler(Fail)
-	reportPath := os.Getenv("JUNIT_REPORT_FOLDER")
+	reportPath := os.Getenv("JUNIT_REPORT_DIR")
 	if reportPath != "" {
 		name := regexp.MustCompile("[^a-zA-Z0-9]+").ReplaceAllString(suitePath, "__")
 		reportPath := fmt.Sprintf("%s/%s_%d.xml", reportPath, name, config.GinkgoConfig.ParallelNode)