From 04ad01a06498d8e65218e90eb604bad765b6c2e0 Mon Sep 17 00:00:00 2001 From: Leo Simons Date: Thu, 31 Jul 2014 16:04:29 +0200 Subject: [PATCH] Commit missing .kitchen.yml --- .gitignore | 5 ++++- tools/appliance/.ruby-version | 1 + tools/vagrant/systemvm/.gitignore | 1 + tools/vagrant/systemvm/.kitchen.yml | 15 +++++++++++++++ tools/vagrant/systemvm/.ruby-version | 1 + tools/vagrant/systemvm/.rvmrc | 24 ++++++++++++++++++++++++ 6 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 tools/appliance/.ruby-version create mode 100644 tools/vagrant/systemvm/.kitchen.yml create mode 100644 tools/vagrant/systemvm/.ruby-version create mode 100644 tools/vagrant/systemvm/.rvmrc diff --git a/.gitignore b/.gitignore index 4ce64ef4e28..cba58155992 100644 --- a/.gitignore +++ b/.gitignore @@ -56,7 +56,10 @@ tools/cli/build/ *.iso *.tar.gz *.tgz -.* + +# this ignores _all files starting with '.'. Don't do that! +#.* + target-eclipse awsapi/modules/* !.gitignore diff --git a/tools/appliance/.ruby-version b/tools/appliance/.ruby-version new file mode 100644 index 00000000000..7a895c21423 --- /dev/null +++ b/tools/appliance/.ruby-version @@ -0,0 +1 @@ +1.9.3-p484 diff --git a/tools/vagrant/systemvm/.gitignore b/tools/vagrant/systemvm/.gitignore index 63967edb2a0..8ba2d02c2d8 100644 --- a/tools/vagrant/systemvm/.gitignore +++ b/tools/vagrant/systemvm/.gitignore @@ -50,3 +50,4 @@ iso/* rspec.xml vagrant_ssh_config +.kitchen/ diff --git a/tools/vagrant/systemvm/.kitchen.yml b/tools/vagrant/systemvm/.kitchen.yml new file mode 100644 index 00000000000..2441b73c837 --- /dev/null +++ b/tools/vagrant/systemvm/.kitchen.yml @@ -0,0 +1,15 @@ +--- +driver: + name: vagrant + vagrantfile_erb: Vagrantfile.kitchen + +provisioner: + name: shell + +platforms: + - name: systemvm + +suites: + - name: default + run_list: + attributes: diff --git a/tools/vagrant/systemvm/.ruby-version b/tools/vagrant/systemvm/.ruby-version new file mode 100644 index 00000000000..7a895c21423 --- /dev/null +++ b/tools/vagrant/systemvm/.ruby-version @@ -0,0 +1 @@ +1.9.3-p484 diff --git a/tools/vagrant/systemvm/.rvmrc b/tools/vagrant/systemvm/.rvmrc new file mode 100644 index 00000000000..3c8c66c97f9 --- /dev/null +++ b/tools/vagrant/systemvm/.rvmrc @@ -0,0 +1,24 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. + +rvm use ruby-1.9.3@vagrant-release-cloudstack --create +export VAGRANT_HOME=$HOME/.vagrant.d-release-cloudstack +bundle check > /dev/null 2>&1 +RETVAL=$? +if [ $RETVAL -ne 0 ]; then + bundle install +fi