summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwenchma <wenchma@cn.ibm.com>2015-06-16 11:44:55 +0800
committerwenchma <wenchma@cn.ibm.com>2015-06-16 11:44:55 +0800
commit069d3c0d8b5b3e3bfd29841e5ba97c1e8a5275c9 (patch)
tree5ec0a61f2e634fd10163787502dc8b822ea79fc4
parent44e49f9c9cfedf71ab99930fae16423709f9f4a9 (diff)
Sync stackforge/cookbook* to openstack/cookbook* for ops-database cookbook
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Mark Vanderwiel <vanderwl@us.ibm.com> Workflow+1: JJ Asghar <jj@getchef.com> Submitted-by: Jenkins Submitted-at: Tue, 16 Jun 2015 16:02:26 +0000 Reviewed-on: https://review.openstack.org/192046 Project: openstack/cookbook-openstack-ops-database Branch: refs/heads/master
-rw-r--r--Berksfile2
-rw-r--r--TESTING.md2
-rwxr-xr-xbootstrap.sh4
3 files changed, 4 insertions, 4 deletions
diff --git a/Berksfile b/Berksfile
index 2498c03..50da25e 100644
--- a/Berksfile
+++ b/Berksfile
@@ -3,4 +3,4 @@ source "https://supermarket.chef.io"
3metadata 3metadata
4 4
5cookbook "openstack-common", 5cookbook "openstack-common",
6 github: "stackforge/cookbook-openstack-common" 6 github: "openstack/cookbook-openstack-common"
diff --git a/TESTING.md b/TESTING.md
index d9a964d..1dd45c5 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -1,6 +1,6 @@
1# Testing the Cookbook # 1# Testing the Cookbook #
2 2
3This cookbook uses [chefdk](https://downloads.chef.io/chef-dk/) and [berkshelf](http://berkshelf.com/) to isolate dependencies. Make sure you have chefdk and the header files for `gecode` installed before continuing. Make sure that you're using gecode version 3. More info [here](https://github.com/opscode/dep-selector-libgecode/tree/0bad63fea305ede624c58506423ced697dd2545e#using-a-system-gecode-instead). For more detailed information on what needs to be installed, you can have a quick look into the bootstrap.sh file in this repository, which does install all the needed things to get going on ubuntu trusty. The tests defined in the Rakefile include lint, style and unit. For integration testing please refere to the [openstack-chef-repo](https://github.com/stackforge/openstack-chef-repo). 3This cookbook uses [chefdk](https://downloads.chef.io/chef-dk/) and [berkshelf](http://berkshelf.com/) to isolate dependencies. Make sure you have chefdk and the header files for `gecode` installed before continuing. Make sure that you're using gecode version 3. More info [here](https://github.com/opscode/dep-selector-libgecode/tree/0bad63fea305ede624c58506423ced697dd2545e#using-a-system-gecode-instead). For more detailed information on what needs to be installed, you can have a quick look into the bootstrap.sh file in this repository, which does install all the needed things to get going on ubuntu trusty. The tests defined in the Rakefile include lint, style and unit. For integration testing please refere to the [openstack-chef-repo](https://github.com/openstack/openstack-chef-repo).
4 4
5We have three test suites which you can run either, individually (there are three rake tasks): 5We have three test suites which you can run either, individually (there are three rake tasks):
6 6
diff --git a/bootstrap.sh b/bootstrap.sh
index f38a960..fe49ef2 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,8 +1,8 @@
1#!/bin/bash -x 1#!/bin/bash -x
2## This script is for installing all the needed packages on trusty to run the chef tests with 'chef exec rake'. 2## This script is for installing all the needed packages on trusty to run the chef tests with 'chef exec rake'.
3## It relies on the common bootstrap.sh from stackforge/cookbook-openstack-common for installing common dependencies. 3## It relies on the common bootstrap.sh from openstack/cookbook-openstack-common for installing common dependencies.
4 4
5curl https://raw.githubusercontent.com/stackforge/cookbook-openstack-common/master/bootstrap.sh \ 5curl https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/bootstrap.sh \
6 --retry 3 \ 6 --retry 3 \
7 --silent \ 7 --silent \
8 --show-error \ 8 --show-error \