fix multi patch support

- patches are comma separated
- fix to also use zuul_changes instead of repo_dev

Change-Id: I257b0c9e72749281113a5e6ff5ccf3a4d304fc7b

bootstrap.sh

@@ -10,5 +10,5 @@ curl https://raw.githubusercontent.com/openstack/cookbook-openstack-common/maste
 
 # To enable cookbook Depends-On support, the Common bootstrap above will already
 # get the cookbook dependencies cloned into ../openstack-cookbook-xxxx.  In order to
-# have the repo tests finds this, the Berksfile REPO_DEV support needs to be enabled.
-export REPO_DEV=ON
+# have the repo tests use these cookbooks patches, the Berksfile uses the ZUUL_CHANGES
+# variable to trigger using local cookbooks.

tools/test_patch.rb

@@ -161,7 +161,7 @@ LONGDESC
     Dir.chdir(dir_name) do
       if options[:patches] && !options[:skip]
         user = get_gerrit_user(options[:username])
-        options[:patches].split(' ').each do |patch|
+        options[:patches].split(',').each do |patch|
           patch_info = get_patch_info(user, patch)
           add_patch(patch_info)
         end
@@ -169,7 +169,7 @@ LONGDESC
 
       run('git clone --depth 1 git@github.com:openstack/openstack-chef-repo.git') unless options[:skip]
       Dir.chdir('openstack-chef-repo') do
-        ENV['REPO_DEV'] = options[:patches]
+        ENV['ZUUL_CHANGES'] = options[:patches]
         run('chef exec rake berks_vendor') unless options[:skip]
 
         (1..(options[:idempotent] ? 2 : 1)).each do |pass|