From 4dfa6e03205aa8055e2522bc96f0633fc17359b9 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 4 Aug 2015 20:35:36 -0400 Subject: [PATCH] acceptance: bump to Liberty release Upgrade acceptance manifest from Kilo (stable) to Liberty (dev) on both Ubuntu Trusty & Centos7. Change-Id: I1e2b09c79e20ee1212906a680f2f3f5b8e93fe91 Co-Authored-By: Lukas Bezdicka Depends-On: I7c1f31b3cc4c6ea1f894a263a8cff60e357accb8 --- spec/acceptance/basic_swift_spec.rb | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/spec/acceptance/basic_swift_spec.rb b/spec/acceptance/basic_swift_spec.rb index ff6325b0..0d2f07eb 100644 --- a/spec/acceptance/basic_swift_spec.rb +++ b/spec/acceptance/basic_swift_spec.rb @@ -12,14 +12,28 @@ describe 'basic swift' do case $::osfamily { 'Debian': { include ::apt - class { '::openstack_extras::repo::debian::ubuntu': - release => 'kilo', - package_require => true, + apt::ppa { 'ppa:ubuntu-cloud-archive/liberty-staging': + # it's false by default in 2.x series but true in 1.8.x + package_manage => false, } + Exec['apt_update'] -> Package<||> } 'RedHat': { class { '::openstack_extras::repo::redhat::redhat': - release => 'kilo', + manage_rdo => false, + repo_hash => { + # we need kilo repo to be installed for dependencies + 'rdo-kilo' => { + 'baseurl' => 'https://repos.fedorapeople.org/repos/openstack/openstack-kilo/el7/', + 'descr' => 'RDO kilo', + 'gpgcheck' => 'no', + }, + 'rdo-liberty' => { + 'baseurl' => 'http://trunk.rdoproject.org/centos7/current/', + 'descr' => 'RDO trunk', + 'gpgcheck' => 'no', + }, + }, } package { 'openstack-selinux': ensure => 'latest' } }