[DRE-commits] [gitlab] 07/12: use environment variable to exclude groups

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit 3818dcf65a56cb289d0254bccf8e8294c03cdeed
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Sep 18 19:06:28 2016 +0530

    use environment variable to exclude groups
---
 debian/patches/0100-remove-development-test.patch | 14 +++++++++-----
 debian/tests/spec                                 |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
index b3ab217..a65dbc4 100644
--- a/debian/patches/0100-remove-development-test.patch
+++ b/debian/patches/0100-remove-development-test.patch
@@ -2,7 +2,7 @@ Bundler will fail when it can't find these locally
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -245,87 +245,66 @@
+@@ -245,87 +245,67 @@
    gem 'influxdb', '~> 0.2', require: false
  end
  
@@ -37,7 +37,8 @@ Bundler will fail when it can't find these locally
 -  gem 'database_cleaner',   '~> 1.5.0'
 -  gem 'factory_girl_rails', '~> 4.6.0'
 -  gem 'rspec-rails',        '~> 3.5.0'
-+group :development, optional: true do
++#group :development, optional: true do
++if ENV["INCLUDE_TEST_DEPENDS"] == "true"
 +#  gem 'byebug', '~> 8.2.1', platform: :mri
 +#  gem 'pry-rails', '~> 0.3.4'
 +#
@@ -124,9 +125,12 @@ Bundler will fail when it can't find these locally
 +#  gem 'sham_rack', '~> 1.3.6'
  end
  
- group :production do
-   gem 'gitlab_meta', '7.0'
- end
+-group :production do
+-  gem 'gitlab_meta', '7.0'
+-end
++#group :production do
++#  gem 'gitlab_meta', '7.0'
++#end
  
 -gem 'newrelic_rpm', '~> 3.16'
 +#gem 'newrelic_rpm', '~> 3.16'
diff --git a/debian/tests/spec b/debian/tests/spec
index 460eb3a..eb2be62 100755
--- a/debian/tests/spec
+++ b/debian/tests/spec
@@ -17,6 +17,7 @@ cd /usr/share/gitlab
 su gitlab -c 'truncate -s 0 Gemfile.lock'
 
 export $(cat /etc/gitlab/gitlab-debian.conf)
+export INCLUDE_TEST_DEPENDS="true"
 su gitlab -c "bundle install --with development test --local"
 su gitlab -c "bundle exec rake -f ${AUTOPKGTEST_TMP}/debian/tests/spec.rake
 #config 2/2 failed, controllers many failed

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git