From 3032274023b42f841b9ffd855e74e55b1790f717 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 24 Sep 2014 23:50:14 +0200 Subject: [PATCH] Finalize testing (preparation and documentation). --- README.Fedora | 5 +++++ rOCCI-server.spec | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/README.Fedora b/README.Fedora index 4647748..7b43513 100644 --- a/README.Fedora +++ b/README.Fedora @@ -24,6 +24,8 @@ Testing Requirements: rOCCI-server-doc + rOCCI-server-opennebula + rOCCI-server-ec2 rubygem(bundler) rubygem(guard-test) rubygem(rspec-rails) < 3 @@ -33,6 +35,9 @@ Launch: cd /usr/share/rOCCI-server + # use Gemfile needed for tests + export BUNDLE_GEMFILE=Gemfile.tests + # use local versions of all gems rm -f Gemfile.lock bundle install --local diff --git a/rOCCI-server.spec b/rOCCI-server.spec index cd19b98..d4e4baf 100644 --- a/rOCCI-server.spec +++ b/rOCCI-server.spec @@ -123,7 +123,7 @@ This package provides Opennebula backend for OCCI server. %patch0 -p1 # updates to keep bundler working (for tests) -mv Gemfile.lock Gemfile.lock.upstream +mv Gemfile.lock Gemfile.upstream.lock cp -p Gemfile Gemfile.upstream cp -p lib/authentication_strategies/bundles/Gemfile.keystone Gemfile.keystone.upstream cp -p lib/backends/bundles/Gemfile.opennebula Gemfile.opennebula.upstream @@ -156,6 +156,9 @@ done sed -i "s/, git:.*//" Gemfile echo 'gem "%{openssl_cms}"' > lib/authentication_strategies/bundles/Gemfile.keystone +# but move away the prepared Gemfile +mv Gemfile Gemfile.tests + # apache >= 2.4 syntax, applicaton prefix sed -i examples/etc/apache2/sites-available/occi-ssl \ -e 's/Allow from all/Require all granted/i' \ -- 1.8.2.3