Skip to content

Commit 70ec60a

Browse files
authored
.github,test: Rename the ARTIFACTS_DIR variable to ARTIFACT_DIR (#2729)
Signed-off-by: timflannagan <[email protected]>
1 parent b75c76f commit 70ec60a

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/workflows/e2e-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/setup-go@v2
2020
with:
2121
go-version: '~1.17'
22-
- 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\]'
22+
- 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\]'
2323
- name: Archive Test Artifacts # test results, failed or not, are always uploaded.
2424
if: ${{ always() }}
2525
uses: actions/upload-artifact@v2

.github/workflows/flaky-e2e.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/setup-go@v2
1616
with:
1717
go-version: '~1.17'
18-
- run: make e2e-local E2E_NODES=1 TEST='\[FLAKE\]' ARTIFACTS_DIR=./artifacts/
18+
- run: make e2e-local E2E_NODES=1 TEST='\[FLAKE\]' ARTIFACT_DIR=./artifacts/
1919
- name: Archive Test Artifacts # test results, failed or not, are always uploaded.
2020
if: ${{ always() }}
2121
uses: actions/upload-artifact@v2

test/e2e/ctx/ctx.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func (ctx TestContext) NewE2EClientSession() {
111111

112112
func (ctx TestContext) DumpNamespaceArtifacts(namespace string) error {
113113
if ctx.artifactsDir == "" {
114-
ctx.Logf("$ARTIFACTS_DIR is unset -- not collecting failed test case logs")
114+
ctx.Logf("$ARTIFACT_DIR is unset -- not collecting failed test case logs")
115115
return nil
116116
}
117117
ctx.Logf("collecting logs in the %s artifacts directory", ctx.artifactsDir)

test/e2e/e2e_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ func TestEndToEnd(t *testing.T) {
6262
SetDefaultConsistentlyDuration(30 * time.Second)
6363
SetDefaultConsistentlyPollingInterval(1 * time.Second)
6464

65-
// always configure a junit report when ARTIFACTS_DIR has been set
66-
if artifactsDir := os.Getenv("ARTIFACTS_DIR"); artifactsDir != "" {
65+
// always configure a junit report when ARTIFACT_DIR has been set
66+
if artifactsDir := os.Getenv("ARTIFACT_DIR"); artifactsDir != "" {
6767
junitReporter := reporters.NewJUnitReporter(path.Join(artifactsDir, junitDir, fmt.Sprintf("junit_e2e_%02d.xml", config.GinkgoConfig.ParallelNode)))
6868
RunSpecsWithDefaultAndCustomReporters(t, "End-to-end", []Reporter{junitReporter})
6969
} else {

0 commit comments

Comments
 (0)