From 40f12b482d0b514ee05c898bc04c0ca0628c8692 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 8 Feb 2017 18:05:06 -0500 Subject: Disable midonet unit tests 'https://github.com/midonet/puppet-midonet' doesn't exist anymore, we need to migrate to 'https://github.com/openstack/puppet-midonet' but tests will fail. We need to work with Midokura to get them fixed. In the meantime, let's disable it. Change-Id: Id39bc5a8cd229df3e9b597a0a0f3eada838f4953 --- Puppetfile_extras | 6 +--- spec/classes/tripleo_midonet_agent_spec.rb | 58 ------------------------------ 2 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 spec/classes/tripleo_midonet_agent_spec.rb diff --git a/Puppetfile_extras b/Puppetfile_extras index ce158e4..b927d99 100644 --- a/Puppetfile_extras +++ b/Puppetfile_extras @@ -5,10 +5,6 @@ mod 'haproxy', :git => 'https://github.com/puppetlabs/puppetlabs-haproxy', :ref => 'master' -mod 'midonet', - :git => 'https://github.com/midonet/puppet-midonet', - :ref => 'v2015.06.7' - mod 'tomcat', :git => 'https://github.com/puppetlabs/puppetlabs-tomcat', :ref => '1.3.2' @@ -31,4 +27,4 @@ mod 'datacat', mod 'etcd', :git => 'https://github.com/cristifalcas/puppet-etcd', - :ref => '1.10.0' \ No newline at end of file + :ref => '1.10.0' diff --git a/spec/classes/tripleo_midonet_agent_spec.rb b/spec/classes/tripleo_midonet_agent_spec.rb deleted file mode 100644 index 73d90b6..0000000 --- a/spec/classes/tripleo_midonet_agent_spec.rb +++ /dev/null @@ -1,58 +0,0 @@ -# -# Copyright (C) 2015 Midokura SARL -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# Unit tests for the midonet agent - -require 'spec_helper' - -describe 'tripleo::network::midonet::agent' do - - shared_examples_for 'tripleo::network::midonet::agent' do - - let :params do - { - :zookeeper_servers => ['192.168.2.2', '192.168.2.3'], - :cassandra_seeds => ['192.168.2.2', '192.168.2.3'] - } - end - - it 'should stop openvswitch' do - is_expected.to contain_service('openvswitch').with( - :ensure => 'stopped', - :enable => false - ) - end - - it 'should run the agent with a list of maps' do - is_expected.to contain_class('midonet::midonet_agent').with( - :zk_servers => [{'ip' => '192.168.2.2', - 'port' => 2181}, - {'ip' => '192.168.2.3', - 'port' => 2181}], - :cassandra_seeds => ['192.168.2.2','192.168.2.3'] - ) - end - end - - on_supported_os.each do |os, facts| - context "on #{os}" do - let(:facts) do - facts.merge({}) - end - - it_behaves_like 'tripleo::network::midonet::agent' - end - end -end -- cgit 1.2.3-korg