Remove remaining references to EXTENDED_TEST_PATH

openshift · Mar 12, 2017 · b1d6214 · b1d6214
1 parent 9bbcff7
commit b1d6214
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 7 deletions.
diff --git a/test/extended/alternate_certs.sh b/test/extended/alternate_certs.sh
@@ -5,8 +5,6 @@ source "$(dirname "${BASH_SOURCE}")/../../hack/lib/init.sh"
 
 os::util::environment::setup_all_server_vars "test-extended-alternate-certs/"
 
-export EXTENDED_TEST_PATH="${OS_ROOT}/test/extended"
-
 function cleanup()
 {
 	out=$?

diff --git a/test/extended/alternate_launches.sh b/test/extended/alternate_launches.sh
@@ -8,8 +8,6 @@ source "$(dirname "${BASH_SOURCE}")/../../hack/lib/init.sh"
 os::util::environment::use_sudo
 os::util::environment::setup_all_server_vars "test-extended-alternate-launches/"
 
-export EXTENDED_TEST_PATH="${OS_ROOT}/test/extended"
-
 function cleanup()
 {
 	out=$?

diff --git a/test/extended/networking.sh b/test/extended/networking.sh
@@ -208,7 +208,6 @@ function run-extended-tests() {
   fi
 
   export KUBECONFIG="${kubeconfig}"
-  export EXTENDED_TEST_PATH="${OS_ROOT}/test/extended"
 
   local test_args="--test.v '--ginkgo.skip=${skip_regex}' \
 '--ginkgo.focus=${focus_regex}' ${TEST_EXTRA_ARGS}"
@@ -230,7 +229,7 @@ function run-extended-tests() {
     fi
   fi
 
-  pushd "${EXTENDED_TEST_PATH}/networking" > /dev/null
+  pushd "${OS_ROOT}/test/extended/networking" > /dev/null
     eval "${test_cmd}; "'exit_status=${PIPESTATUS[0]}'
   popd > /dev/null
 

diff --git a/test/extended/setup.sh b/test/extended/setup.sh
@@ -30,7 +30,6 @@ function os::test::extended::setup () {
 	os::util::ensure::built_binary_exists 'junitmerge'
 
 	# ensure proper relative directories are set
-	export EXTENDED_TEST_PATH="${OS_ROOT}/test/extended"
 	export KUBE_REPO_ROOT="${OS_ROOT}/vendor/k8s.io/kubernetes"
 
 	os::util::environment::setup_time_vars
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,8 +5,6 @@ source "$(dirname "${BASH_SOURCE}")/../../hack/lib/init.sh" @@
     os::util::environment::setup_all_server_vars "test-extended-alternate-certs/"
-    export EXTENDED_TEST_PATH="${OS_ROOT}/test/extended"
     function cleanup()
     {
     	out=$?
@@ Expand Down @@