Skip to content

.github,test: Rename the ARTIFACTS_DIR variable to ARTIFACT_DIR #2729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Apr 7, 2022
Merged

.github,test: Rename the ARTIFACTS_DIR variable to ARTIFACT_DIR #2729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flaky-e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/ctx/ctx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down