@@ -8,6 +8,10 @@ set -o errexit

 set -o nounset

 set -o pipefail

+# must run before we mutate the GOPATH in setup_env

+go get -d k8s.io/kubernetes/pkg/util

+export KUBE_REPO_ROOT="${GOPATH}/src/k8s.io/kubernetes"

+

 OS_ROOT=$(dirname "${BASH_SOURCE}")/../..

 source "${OS_ROOT}/hack/util.sh"

 source "${OS_ROOT}/hack/common.sh"

@@ -24,7 +28,13 @@ os::build::setup_env

 export TMPDIR="${TMPDIR:-"/tmp"}"

 export BASETMPDIR="${TMPDIR}/openshift-extended-tests/core"

 export EXTENDED_TEST_PATH="${OS_ROOT}/test/extended"

-export KUBE_REPO_ROOT="${OS_ROOT}/../../../k8s.io/kubernetes"

+

+# TODO: check out the version of Kube we need so that we have access to sample content - in the future,

+# we want to get this content as well from cherrypicks (e2e test that is cherry-picked depends on content).

+k8s_version=$(go run ${OS_ROOT}/hack/version.go ${OS_ROOT}/Godeps/Godeps.json k8s.io/kubernetes/pkg/util)

+pushd "${KUBE_REPO_ROOT}" &>/dev/null

+git checkout "${k8s_version}"

+popd &>/dev/null

 function join { local IFS="$1"; shift; echo "$*"; }

@@ -39,28 +49,28 @@ SKIP_TESTS=(

   Kibana                  # Not installed

   DNS                     # Can't depend on kube-dns

   kube-ui                 # Not installed by default

-  DaemonRestart           # Experimental mode not enabled yet

-  "Daemon set"            # Experimental mode not enabled yet

-  Job                     # Not enabled yet

+  #DaemonRestart           # Experimental mode not enabled yet

+  #"Daemon set"            # Experimental mode not enabled yet

+  #Job                     # Not enabled yet

   "deployment should"     # Not enabled yet

   Ingress                 # Not enabled yet

   # Need fixing

   "Cluster upgrade"       # panic because createNS not called, refactor framework?

   PersistentVolume        # Not skipping on non GCE environments?

-  EmptyDir                # TRIAGE

-  Proxy                   # TRIAGE

-  "Examples e2e"          # TRIAGE: Some are failing due to permissions

-  Kubectl                 # TRIAGE: we don't support the kubeconfig flag, and images won't run

-  Namespaces              # Namespace controller broken, issue #4731

+  #EmptyDir                # TRIAGE

+  #Proxy                   # TRIAGE

+  #"Examples e2e"          # TRIAGE: Some are failing due to permissions

+  #Kubectl                 # TRIAGE: we don't support the kubeconfig flag, and images won't run

+  #Namespaces              # Namespace controller broken, issue #4731

   "hostPath"              # Need to add ability for the test case to use to hostPath

   "mount an API token into pods" # We add 6 secrets, not 1

-  "create a functioning NodePort service" # Tries to bind to port 80, needs cap netsys upstream

+  #"create a functioning NodePort service" # Tries to bind to port 80, needs cap netsys upstream

   "Networking should function for intra-pod" # Needs two nodes, add equiv test for 1 node, then use networking suite

-  "environment variables for services" # Tries to proxy directly to the node, but the underlying cert is wrong?  Is proxy broken?

-  "should provide labels and annotations files" # the image can't read the files

+  #"environment variables for services" # Tries to proxy directly to the node, but the underlying cert is wrong?  Is proxy broken?

+  #"should provide labels and annotations files" # the image can't read the files

   "Ask kubelet to report container resource usage" # container resource usage not exposed yet?

-  "should provide Internet connection for containers" # DNS inside container failing!!!

+  #"should provide Internet connection for containers" # DNS inside container failing!!!

   "able to delete 10 pods per node" # Panic because stats port isn't exposed

   "Kubelet regular resource usage tracking over" # takes too long

   "Kubelet experimental resource usage tracking" # takes too long

@@ -71,10 +81,10 @@ SKIP_TESTS=(

   # Needs triage to determine why it is failing

   "Addon update"          # TRIAGE

   SSH                     # TRIAGE

-  Probing                 # TRIAGE

-  "should call prestop" # Needs triage, auth maybe

-  "be restarted with a /healthz" # used to be working

-  "Port forwarding With a server that expects" # used to be working

+  #Probing                 # TRIAGE

+  #"should call prestop" # Needs triage, auth maybe

+  #"be restarted with a /healthz" # used to be working

+  #"Port forwarding With a server that expects" # used to be working

 )

 DEFAULT_SKIP=$(join '|' "${SKIP_TESTS[@]}")

 SKIP="${SKIP:-$DEFAULT_SKIP}"