openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "unpin Tempest and bump RDO repos"

Browse Source
This commit is contained in:
Jenkins 2016-05-30 16:08:56 +00:00 committed by Gerrit Code Review
commit cd197f5315
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fixtures/scenario002.pp
View File

@ -19,10 +19,16 @@ case $::osfamily {
$ipv6 = false $ipv6 = false
# zaqar is not packaged in Ubuntu Trusty # zaqar is not packaged in Ubuntu Trusty
$zaqar_enabled = false $zaqar_enabled = false
# TODO(emilien): enable again when deploying Newton
# A recent patch in Tempest broke tests in Ironic Mitaka
# Fixed in master: https://review.openstack.org/322608 but
# not backported.
$ironic_enabled = false
} }
'RedHat': { 'RedHat': {
$ipv6 = true $ipv6 = true
$zaqar_enabled = true $zaqar_enabled = true
$ironic_enabled = true
} }
default: { default: {
fail("Unsupported osfamily (${::osfamily})") fail("Unsupported osfamily (${::osfamily})")
@ -52,7 +58,9 @@ include ::openstack_integration::neutron
include ::openstack_integration::nova include ::openstack_integration::nova
include ::openstack_integration::cinder include ::openstack_integration::cinder
include ::openstack_integration::swift include ::openstack_integration::swift
include ::openstack_integration::ironic if $ironic_enabled {
include ::openstack_integration::ironic
}
include ::openstack_integration::zaqar include ::openstack_integration::zaqar
include ::openstack_integration::mongodb include ::openstack_integration::mongodb
include ::openstack_integration::provision include ::openstack_integration::provision
@ -61,6 +69,6 @@ include ::openstack_integration::provision
class { '::openstack_integration::tempest': class { '::openstack_integration::tempest':
cinder => true, cinder => true,
swift => true, swift => true,
ironic => true, ironic => $ironic_enabled,
zaqar => $zaqar_enabled, zaqar => $zaqar_enabled,
} }

2
manifests/repos.pp
View File

@ -24,7 +24,7 @@ class openstack_integration::repos {
manage_epel => false, manage_epel => false,
repo_hash => { repo_hash => {
'newton-current' => { 'newton-current' => {
'baseurl' => 'https://trunk.rdoproject.org/centos7-master/55/47/5547170191b2306e4c72d64599d58a69935b750a_afa16dfd/', 'baseurl' => 'https://trunk.rdoproject.org/centos7-master/58/4b/584b2bd6a33ce8e223a4ede8aec38b87b9987eda_17764cd8/',
'descr' => 'Newton current', 'descr' => 'Newton current',
'gpgcheck' => 'no', 'gpgcheck' => 'no',
'priority' => 1, 'priority' => 1,

5
run_tests.sh
View File

@ -207,11 +207,6 @@ TESTS="${TESTS} TestManageQueue"
print_header 'Running Tempest' print_header 'Running Tempest'
cd /tmp/openstack/tempest cd /tmp/openstack/tempest
# TODO(emilien): remove pin when https://review.openstack.org/322608
# is merged and RDO bumped.
git checkout b02fa114b8bf0bc5d7b477ad887cf570ea55c1bb
tox -eall-plugin -- --concurrency=2 $TESTS tox -eall-plugin -- --concurrency=2 $TESTS
RESULT=$? RESULT=$?
set -e set -e