... | ... |
@@ -30,10 +30,10 @@ exitstatus=0 |
30 | 30 |
# run parallel tests |
31 | 31 |
nodes="${PARALLEL_NODES:-5}" |
32 | 32 |
os::log::info "Running parallel tests N=${nodes}" |
33 |
-TEST_REPORT_FILE_NAME=conformance_parallel ginkgo -v "-focus=${pf}" "-skip=${ps}" -p -nodes "${nodes}" "$( os::util::find::built_binary extended.test )" -- -ginkgo.v -test.timeout 6h || exitstatus=$? |
|
33 |
+TEST_REPORT_FILE_NAME=conformance_parallel ginkgo -noColor -v "-focus=${pf}" "-skip=${ps}" -p -nodes "${nodes}" "$( os::util::find::built_binary extended.test )" -- -ginkgo.noColor -ginkgo.v -test.timeout 6h || exitstatus=$? |
|
34 | 34 |
|
35 | 35 |
# run tests in serial |
36 | 36 |
os::log::info "Running serial tests" |
37 |
-TEST_REPORT_FILE_NAME=conformance_serial ginkgo -v "-focus=${sf}" "-skip=${ss}" "$( os::util::find::built_binary extended.test )" -- -ginkgo.v -test.timeout 2h || exitstatus=$? |
|
37 |
+TEST_REPORT_FILE_NAME=conformance_serial ginkgo -noColor -v "-focus=${sf}" "-skip=${ss}" "$( os::util::find::built_binary extended.test )" -- -ginkgo.noColor -ginkgo.v -test.timeout 2h || exitstatus=$? |
|
38 | 38 |
|
39 | 39 |
exit $exitstatus |
... | ... |
@@ -28,16 +28,16 @@ function os::test::extended::setup () { |
28 | 28 |
os::util::ensure::built_binary_exists 'oadm' |
29 | 29 |
os::util::ensure::built_binary_exists 'oc' |
30 | 30 |
|
31 |
- os::util::environment::setup_time_vars |
|
32 |
- os::util::environment::use_sudo |
|
33 |
- os::util::environment::setup_all_server_vars "test-extended/core" |
|
34 |
- |
|
35 | 31 |
# ensure proper relative directories are set |
36 | 32 |
export EXTENDED_TEST_PATH="${OS_ROOT}/test/extended" |
37 | 33 |
export KUBE_REPO_ROOT="${OS_ROOT}/vendor/k8s.io/kubernetes" |
38 | 34 |
|
39 | 35 |
# allow setup to be skipped |
40 | 36 |
if [[ -z "${TEST_ONLY+x}" ]]; then |
37 |
+ os::util::environment::setup_time_vars |
|
38 |
+ os::util::environment::use_sudo |
|
39 |
+ os::util::environment::setup_all_server_vars "test-extended/core" |
|
40 |
+ |
|
41 | 41 |
os::util::ensure::iptables_privileges_exist |
42 | 42 |
|
43 | 43 |
function cleanup() { |