From 33275e78f4077b4a4c35e857e0c6ca9c72e06009 Mon Sep 17 00:00:00 2001 From: Adam Gandelman Date: Mon, 9 Jun 2014 13:37:33 -0700 Subject: [PATCH] Update apt cache before installing UCA keyring add-apt-repository will attempt to install the ubuntu-cloud-keyring package. Call 'apt-get update' first to ensure the local cache is up to date and the package can be found. This also updates dsg to only set this up if running on Precise. Change-Id: Ie349e89ef20ac4c526c8353cf4aabe3ddad73824 Partial-bug: #1326754. --- .../jenkins_job_builder/config/devstack-gate.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index de8e66899d..0f342f95ed 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -601,9 +601,13 @@ r="$r tempest.scenario.test_baremetal_basic_ops" export DEVSTACK_GATE_TEMPEST_REGEX="$r" - # pull in libvirt /w ovs support from ubuntu cloud-archive. - sudo add-apt-repository cloud-archive:icehouse - sudo apt-get update + if $(grep -Eqs 'Ubuntu 12.04' /etc/lsb-release); then + # pull in libvirt /w ovs support from ubuntu cloud-archive for + # Precise. + sudo apt-get update + sudo add-apt-repository cloud-archive:icehouse + sudo apt-get update + fi # prevent sshd from jumping to the ovs bridge on Precise instances. IP=$(ip addr show eth0 | grep 'inet ' | sed 's/inet \([0-9\.]*\)\/.*/\1/' | tr -d ' ')