From a26536ea77e28348e8fccaa167617f8641c00adb Mon Sep 17 00:00:00 2001 From: Samuel Cassiba Date: Fri, 23 Feb 2018 07:43:00 -0800 Subject: [PATCH] stable/pike release Change-Id: I0967ea565a1dbe8f2cc80748a17da2708af99725 --- .gitignore | 2 +- .gitreview | 1 + Berksfile | 6 ++++-- bootstrap.sh | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d7ee44a..fa2b288 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,6 @@ berks-cookbooks/ .vagrant .coverage/ *.swp -Berksfile.lock Vagrantfile Gemfile.lock +Berksfile.lock diff --git a/.gitreview b/.gitreview index 1fa221f..ef6a273 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.openstack.org port=29418 project=openstack/cookbook-openstack-integration-test.git +defaultbranch=stable/pike diff --git a/Berksfile b/Berksfile index 35719f4..7bade52 100644 --- a/Berksfile +++ b/Berksfile @@ -4,11 +4,13 @@ source 'https://supermarket.chef.io' if Dir.exist?("../cookbook-openstack-#{cookbook}") cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}" else - cookbook "openstack-#{cookbook}", github: "openstack/cookbook-openstack-#{cookbook}" + cookbook "openstack-#{cookbook}", github: "openstack/cookbook-openstack-#{cookbook}", + branch: 'stable/pike' end end cookbook 'openstackclient', - github: 'cloudbau/cookbook-openstackclient' + github: 'cloudbau/cookbook-openstackclient', + branch: 'stable/pike' metadata diff --git a/bootstrap.sh b/bootstrap.sh index fe49ef2..1fc6d69 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -2,7 +2,7 @@ ## This script is for installing all the needed packages on trusty to run the chef tests with 'chef exec rake'. ## It relies on the common bootstrap.sh from openstack/cookbook-openstack-common for installing common dependencies. -curl https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/bootstrap.sh \ +curl https://raw.githubusercontent.com/openstack/cookbook-openstack-common/stable/pike/bootstrap.sh \ --retry 3 \ --silent \ --show-error \