artifacts, Change output-dir command

in ginkgo v2 there is a new way to configure the artifacts folder This iliminates the need to copy the artifactson teardown. Signed-off-by: Ram Lavi <[email protected]>
k8snetworkplumbingwg · Jun 21, 2022 · 0a09ee3 · 0a09ee3
1 parent 10e219d
commit 0a09ee3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/automation/check-patch.e2e-k8s.sh b/automation/check-patch.e2e-k8s.sh
@@ -2,7 +2,6 @@
 
 teardown() {
     make cluster-down
-    cp $(find . -name "*junit*.xml") $ARTIFACTS || true
 }
 
 main() {
@@ -17,7 +16,7 @@ main() {
     make cluster-up
     trap teardown EXIT SIGINT SIGTERM SIGSTOP
     make cluster-sync
-    make E2E_TEST_ARGS="-ginkgo.noColor --junit-output=$ARTIFACTS/junit.functest.xml" functest
+    make E2E_TEST_ARGS="-ginkgo.noColor --output-dir=$ARTIFACTS --junit-report=junit.functest.xml" functest
 }
 
 [[ "${BASH_SOURCE[0]}" == "$0" ]] && main "$@"
diff --git a/automation/check-patch.unit-test.sh b/automation/check-patch.unit-test.sh
@@ -1,15 +1,9 @@
 #!/bin/bash -e
 
-teardown() {
-    cp $(find . -name "*junit*.xml") $ARTIFACTS || true
-}
-
 main() {
     source automation/check-patch.setup.sh
     cd ${TMP_PROJECT_PATH}
 
-    trap teardown EXIT SIGINT SIGTERM SIGSTOP
-
     make all
     make check
     make test