Skip to content

Commit

Permalink
Changed JRE memory configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
cptactionhank committed Feb 4, 2016
1 parent 274a6b9 commit 6e5771c
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
1 change: 1 addition & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
--color
--require spec_helper
--format documentation
--fail-fast
22 changes: 11 additions & 11 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
machine:
ruby:
version: "2.2.3"
version: 2.2.3
pre:
- "sudo apt-get install jq"
- "gem install bundler"
- sudo apt-get install jq
- gem install bundler
services:
- "docker"
- docker

dependencies:
pre:
- "docker pull postgres:9.3"
- "docker pull mysql:5.6"
- "docker pull java:8"
- "gem install bundler"
- docker pull postgres:9.3
- docker pull mysql:5.6
- docker pull java:8
- gem install bundler

database:
override:
- "bin/setup_databases"
- bin/setup_databases

test:
pre:
- "bin/prepare"
- bin/prepare
override:
- "bundle exec rspec --format documentation --require rspec_junit_formatter --format RspecJunitFormatter --out $CIRCLE_TEST_REPORTS/rspec/junit.xml"
- bundle exec rspec --format documentation --require rspec_junit_formatter --format RspecJunitFormatter --out $CIRCLE_TEST_REPORTS/rspec/junit.xml

deployment:
newest-version:
Expand Down
2 changes: 1 addition & 1 deletion spec/support/helpers/docker_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def host

def setup_capybara_url(port)
docker_url = URI.parse Docker.url
docker_url.host = 'localhost' if docker_url.scheme == 'unix'
docker_url.host = '172.0.0.1' if docker_url.scheme == 'unix'
docker_url.scheme = 'http'
docker_url.path = ''
docker_url.port = mapped_port port
Expand Down
2 changes: 1 addition & 1 deletion spec/support/shared_examples/jira_shared_example.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
require 'spec_helper'

shared_examples 'an acceptable JIRA instance' do |database_examples|
include_context 'a buildable docker image', '.', Env: ["CATALINA_OPTS=-Xms1024m -Datlassian.plugins.enable.wait=#{Docker::DSL.timeout} -Datlassian.darkfeature.jira.onboarding.feature.disabled=true"]
include_context 'a buildable docker image', '.', Env: ["CATALINA_OPTS=-Xms1024m -Xmx2048m -Datlassian.plugins.enable.wait=#{Docker::DSL.timeout} -Datlassian.darkfeature.jira.onboarding.feature.disabled=true"]

describe 'when starting a JIRA instance' do
before(:all) { @container.start! PublishAllPorts: true }
Expand Down

0 comments on commit 6e5771c

Please sign in to comment.