From e21357f782c3bb4bf8a3b29c30fe7ee7ac9bb013 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 8 Feb 2017 05:58:57 -0700 Subject: [PATCH] Disable beaker on Ubuntu The ubuntu package is broken for ocata-m2, so let's skip acceptance testing for now. Change-Id: I87feb48f4a7ccdbf818a15c1a0fabada6b44ad6e (cherry picked from commit eb0fb263b876927c7bcf2f16e288b254beb4d885) --- spec/acceptance/watcher_spec.rb | 60 ++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/spec/acceptance/watcher_spec.rb b/spec/acceptance/watcher_spec.rb index 43fca9a..e7708ab 100644 --- a/spec/acceptance/watcher_spec.rb +++ b/spec/acceptance/watcher_spec.rb @@ -27,34 +27,38 @@ describe 'basic watcher' do require => Class['rabbitmq'], } - class { '::watcher::db::mysql': - password => 'a_big_secret', - } - class { '::watcher::db': - database_connection => 'mysql+pymysql://watcher:a_big_secret@127.0.0.1/watcher?charset=utf8', - } - class { '::watcher::keystone::auth': - password => 'a_big_secret', - } - class { '::watcher::keystone::authtoken': - password => 'a_big_secret', - } - class { '::watcher::logging': - debug => true, - } - class { '::watcher': - default_transport_url => 'rabbit://watcher:my_secret@127.0.0.1:5672/', - } - class { '::watcher::api': - watcher_client_password => 'a_big_secret', - create_db_schema => true, - upgrade_db => true, - } - class { '::watcher::applier': - applier_workers => '2', - } - class { '::watcher::decision_engine': - decision_engine_workers => '2', + # TODO(aschultz): fix after Ubuntu ocata-m3/rc1. watcher-db-manage is + # broken + if ($::osfamily == 'RedHat') { + class { '::watcher::db::mysql': + password => 'a_big_secret', + } + class { '::watcher::db': + database_connection => 'mysql+pymysql://watcher:a_big_secret@127.0.0.1/watcher?charset=utf8', + } + class { '::watcher::keystone::auth': + password => 'a_big_secret', + } + class { '::watcher::keystone::authtoken': + password => 'a_big_secret', + } + class { '::watcher::logging': + debug => true, + } + class { '::watcher': + default_transport_url => 'rabbit://watcher:my_secret@127.0.0.1:5672/', + } + class { '::watcher::api': + watcher_client_password => 'a_big_secret', + create_db_schema => true, + upgrade_db => true, + } + class { '::watcher::applier': + applier_workers => '2', + } + class { '::watcher::decision_engine': + decision_engine_workers => '2', + } } EOS