openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "repos: pin RDO to Newton & UCA to stable/mitaka"

Browse Source
This commit is contained in:
Jenkins 2016-05-07 01:37:58 +00:00 committed by Gerrit Code Review
commit 69dff16837
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/repos.pp
View File

@ -4,8 +4,7 @@ class openstack_integration::repos {
'Debian': { 'Debian': {
include ::apt include ::apt
class { '::openstack_extras::repo::debian::ubuntu': class { '::openstack_extras::repo::debian::ubuntu':
repo => 'proposed', release => 'mitaka',
release => 'mitaka', # drop this line when mitaka is stable released
package_require => true, package_require => true,
} }
# Ceph is both packaged on UCA & ceph.com # Ceph is both packaged on UCA & ceph.com
@ -21,9 +20,9 @@ class openstack_integration::repos {
manage_rdo => false, manage_rdo => false,
manage_epel => false, manage_epel => false,
repo_hash => { repo_hash => {
'mitaka-current' => { 'newton-current' => {
'baseurl' => 'https://trunk.rdoproject.org/centos7-mitaka/25/aa/25aae034738eda7c00fb3745aa85b96c6768c0f8_8ba4c30b/', 'baseurl' => 'https://trunk.rdoproject.org/centos7-master/ac/73/ac73adf839501ecdbb4aa3af8e1e624c0d3116b1_5c24f657/',
'descr' => 'Mitaka current', 'descr' => 'Newton current',
'gpgcheck' => 'no', 'gpgcheck' => 'no',
'priority' => 1, 'priority' => 1,
}, },

4
run_tests.sh
View File

@ -181,6 +181,10 @@ wget http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img -P /tmp
# Tempest plugin tests require tempest-lib to be installed # Tempest plugin tests require tempest-lib to be installed
$SUDO pip install tempest-lib $SUDO pip install tempest-lib
# Install Gabbi with pip until it's packaged in RDO:
# https://bugzilla.redhat.com/show_bug.cgi?id=1252812
$SUDO pip install gabbi
set +e set +e
# Select what to test: # Select what to test:
# Smoke suite # Smoke suite