From 06652d961cd18b3f2fe602cd9d7aebb31fe24073 Mon Sep 17 00:00:00 2001
From: timflannagan <timflannagan@gmail.com>
Date: Thu, 7 Apr 2022 10:33:45 -0400
Subject: [PATCH] .github,test: Rename the ARTIFACTS_DIR variable to
 ARTIFACT_DIR

Signed-off-by: timflannagan <timflannagan@gmail.com>
---
 .github/workflows/e2e-tests.yml | 2 +-
 .github/workflows/flaky-e2e.yml | 2 +-
 test/e2e/ctx/ctx.go             | 2 +-
 test/e2e/e2e_test.go            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 23796aa16f..d05d220e0c 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: '~1.17'
-      - run: make e2e-local E2E_TEST_CHUNK=${{ matrix.parallel-id }} E2E_TEST_NUM_CHUNKS=${{ strategy.job-total }} E2E_NODES=2 ARTIFACTS_DIR=./artifacts/ SKIP='\[FLAKE\]'
+      - run: make e2e-local E2E_TEST_CHUNK=${{ matrix.parallel-id }} E2E_TEST_NUM_CHUNKS=${{ strategy.job-total }} E2E_NODES=2 ARTIFACT_DIR=./artifacts/ SKIP='\[FLAKE\]'
       - name: Archive Test Artifacts # test results, failed or not, are always uploaded.
         if: ${{ always() }}
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/flaky-e2e.yml b/.github/workflows/flaky-e2e.yml
index 4ad8ad9fe2..ec4eb82f9d 100644
--- a/.github/workflows/flaky-e2e.yml
+++ b/.github/workflows/flaky-e2e.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: '~1.17'
-      - run: make e2e-local E2E_NODES=1 TEST='\[FLAKE\]' ARTIFACTS_DIR=./artifacts/
+      - run: make e2e-local E2E_NODES=1 TEST='\[FLAKE\]' ARTIFACT_DIR=./artifacts/
       - name: Archive Test Artifacts # test results, failed or not, are always uploaded.
         if: ${{ always() }}
         uses: actions/upload-artifact@v2
diff --git a/test/e2e/ctx/ctx.go b/test/e2e/ctx/ctx.go
index bf94eb2b5a..5ee37787b5 100644
--- a/test/e2e/ctx/ctx.go
+++ b/test/e2e/ctx/ctx.go
@@ -111,7 +111,7 @@ func (ctx TestContext) NewE2EClientSession() {
 
 func (ctx TestContext) DumpNamespaceArtifacts(namespace string) error {
 	if ctx.artifactsDir == "" {
-		ctx.Logf("$ARTIFACTS_DIR is unset -- not collecting failed test case logs")
+		ctx.Logf("$ARTIFACT_DIR is unset -- not collecting failed test case logs")
 		return nil
 	}
 	ctx.Logf("collecting logs in the %s artifacts directory", ctx.artifactsDir)
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index 07a032be92..f37f2c8d08 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -62,8 +62,8 @@ func TestEndToEnd(t *testing.T) {
 	SetDefaultConsistentlyDuration(30 * time.Second)
 	SetDefaultConsistentlyPollingInterval(1 * time.Second)
 
-	// always configure a junit report when ARTIFACTS_DIR has been set
-	if artifactsDir := os.Getenv("ARTIFACTS_DIR"); artifactsDir != "" {
+	// always configure a junit report when ARTIFACT_DIR has been set
+	if artifactsDir := os.Getenv("ARTIFACT_DIR"); artifactsDir != "" {
 		junitReporter := reporters.NewJUnitReporter(path.Join(artifactsDir, junitDir, fmt.Sprintf("junit_e2e_%02d.xml", config.GinkgoConfig.ParallelNode)))
 		RunSpecsWithDefaultAndCustomReporters(t, "End-to-end", []Reporter{junitReporter})
 	} else {