From d3d8ff046514cc7caf9d0c286882168a96efe6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20J=C3=B3zefczyk?= Date: Tue, 23 May 2017 10:17:48 +0200 Subject: [PATCH] Change version of noVNC to stable In master branch of noVNC project file vnc_auto.html was renamed to vnc_lite.html Because of that nova-novncproxy looks for file that actually doesn't exist. We need to change branch of noVNC to latest stable, because other projects are not ready yet to rename the path. Those projects depends on noVNC package installed in system, but it is too old for now for both CentOS (version 0.5) and Ubuntu (version 0.4). The only way to make noVNC console working on Devstack is to change the branch to stable one. Unit test also has to be modified in order to ignore novnc repo from checking against cloning non-master branch. Change-Id: Iaf4761aedf93bc6b914a6a0c5cf1cfedcc29583c Closes-bug: #1692513 --- stackrc | 2 +- tests/test_refs.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stackrc b/stackrc index fd7f3ed4d4..160d12ff3d 100644 --- a/stackrc +++ b/stackrc @@ -563,7 +563,7 @@ IRONIC_PYTHON_AGENT_BRANCH=${IRONIC_PYTHON_AGENT_BRANCH:-master} # a websockets/html5 or flash powered VNC console for vm instances NOVNC_REPO=${NOVNC_REPO:-https://github.com/kanaka/noVNC.git} -NOVNC_BRANCH=${NOVNC_BRANCH:-master} +NOVNC_BRANCH=${NOVNC_BRANCH:-stable/v0.6} # a websockets/html5 or flash powered SPICE console for vm instances SPICE_REPO=${SPICE_REPO:-http://anongit.freedesktop.org/git/spice/spice-html5.git} diff --git a/tests/test_refs.sh b/tests/test_refs.sh index bb2fb932bd..32f45dbc45 100755 --- a/tests/test_refs.sh +++ b/tests/test_refs.sh @@ -15,7 +15,7 @@ echo "Ensuring we don't have crazy refs" -REFS=`grep BRANCH stackrc | grep -v -- '-master' | grep -v -- '-stable/newton'` +REFS=`grep BRANCH stackrc | grep -v -- '-master' | grep -v -- '-stable/newton' | grep -v 'NOVNC_BRANCH'` rc=$? if [[ $rc -eq 0 ]]; then echo "Branch defaults must be master. Found:"