Skip to content

Commit a5c8037

Browse files
Merge pull request #17577 from smarterclayton/k8s
Automatic merge from submit-queue. Bump kubernetes conformance to 1.8
2 parents d1a9074 + cc84bee commit a5c8037

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

test/extended/conformance-k8s.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@ To recreate these results
4343
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/
4444
END
4545

46-
version="${KUBERNETES_VERSION:-release-1.7}"
46+
version="${KUBERNETES_VERSION:-release-1.8}"
4747
kubernetes="${KUBERNETES_ROOT:-${OS_ROOT}/../../../k8s.io/kubernetes}"
48-
if [[ ! -d "${kubernetes}" ]]; then
48+
if [[ -d "${kubernetes}" ]]; then
49+
git fetch origin --tags
50+
else
4951
if [[ -n "${KUBERNETES_ROOT-}" ]]; then
5052
os::log::fatal "Cannot find Kubernetes source directory, set KUBERNETES_ROOT"
5153
fi

0 commit comments

Comments
 (0)