Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.

Commit

Permalink
Issue #156 - user configurable test deploys
Browse files Browse the repository at this point in the history
  • Loading branch information
paxtonhare committed Dec 9, 2013
1 parent cd6d9a8 commit 943a67d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions deploy/default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ content-forests-per-host=1
# turn it on if you are using the roxy unit tester
# test-port=8042
#
# the environments in which we DO NOT want to deploy tests
# typically your production environment.
do-not-deploy-tests=prod
#
# the location of your unit test code
xquery-test.dir=${basedir}/src/test

Expand Down
3 changes: 2 additions & 1 deletion deploy/lib/server_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ def permissions(role, capabilities)
def deploy_tests?(target_db)
@properties['ml.test-content-db'].present? &&
@properties['ml.test-port'].present? &&
@environment != "prod" &&
!@properties['ml.do-not-deploy-tests'].split(",").include?(@environment) &&
@properties['ml.test-modules-db'] == target_db
end

Expand Down Expand Up @@ -1447,6 +1447,7 @@ def ServerConfig.properties(prop_file_location = "../..")
environment = find_arg(environments)

properties["environment"] = environment if environment
properties["ml.environment"] = environment if environment

env_properties_file = File.expand_path("#{prop_file_location}/#{environment}.properties", __FILE__)

Expand Down

0 comments on commit 943a67d

Please sign in to comment.