Skip to content

Commit

Permalink
Merge pull request #17577 from smarterclayton/k8s
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Bump kubernetes conformance to 1.8
  • Loading branch information
openshift-merge-robot authored Dec 5, 2017
2 parents d1a9074 + cc84bee commit a5c8037
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions test/extended/conformance-k8s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,11 @@ To recreate these results
Nightly conformance tests are run against release branches and reported https://openshift-gce-devel.appspot.com/builds/origin-ci-test/logs/test_branch_origin_extended_conformance_k8s/
END

version="${KUBERNETES_VERSION:-release-1.7}"
version="${KUBERNETES_VERSION:-release-1.8}"
kubernetes="${KUBERNETES_ROOT:-${OS_ROOT}/../../../k8s.io/kubernetes}"
if [[ ! -d "${kubernetes}" ]]; then
if [[ -d "${kubernetes}" ]]; then
git fetch origin --tags
else
if [[ -n "${KUBERNETES_ROOT-}" ]]; then
os::log::fatal "Cannot find Kubernetes source directory, set KUBERNETES_ROOT"
fi
Expand Down

0 comments on commit a5c8037

Please sign in to comment.