From 35122ef9371ce372ceb87e062ede385e5f6a4000 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Tue, 5 Jun 2018 09:15:32 -0500 Subject: [PATCH] Updated spice-html5 git repository URL This temporarily disable the upgrade checks, as they will fail at getting the repo, until this gets backported. Change-Id: I5639ebee2d232fdac3f5fe2d38e9a54d2ff8c03a Signed-off-by: Kevin Carter Co-Authored-By: Jean-Philippe Evrard --- defaults/main.yml | 2 +- zuul.d/project.yaml | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index c49405e7..85a9b9fe 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -208,7 +208,7 @@ nova_spice_html5proxy_base_port: 6082 nova_spice_html5proxy_base_uri: "{{ nova_spice_html5proxy_base_proto }}://{{ external_lb_vip_address }}:{{ nova_spice_html5proxy_base_port }}" nova_spice_html5proxy_base_url: "{{ nova_spice_html5proxy_base_uri }}/spice_auto.html" nova_spice_console_agent_enabled: True -nova_spicehtml5_git_repo: https://github.com/SPICE/spice-html5 +nova_spicehtml5_git_repo: https://gitlab.freedesktop.org/spice/spice-html5 nova_spicehtml5_git_install_branch: master ## Nova novnc diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 72c8ce21..6a42ea5f 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -22,7 +22,10 @@ - openstack-ansible-functional-centos-7-nv - openstack-ansible-functional-opensuse-423 - openstack-ansible-functional-ubuntu-xenial - - openstack-ansible-upgrade-ubuntu-xenial + # TODO(evrardjp): Restore upgrade checks + # when git url of spice has been updated in + # all branches. + #- openstack-ansible-upgrade-ubuntu-xenial - openstack-ansible-lxd-ubuntu-xenial - openstack-ansible-nova-ssl-nv experimental: @@ -37,5 +40,8 @@ #- openstack-ansible-functional-centos-7 - openstack-ansible-functional-opensuse-423 - openstack-ansible-functional-ubuntu-xenial - - openstack-ansible-upgrade-ubuntu-xenial + # TODO(evrardjp): Restore upgrade checks + # when git url of spice has been updated in + # all branches. + #- openstack-ansible-upgrade-ubuntu-xenial - openstack-ansible-lxd-ubuntu-xenial