Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Fixing travis ci and other issues #276

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ cache:
- wget_cache
rvm:
- 2.3.7
jdk:
- openjdk8
bundler_args: --without acceptance
script:
- bundle exec rake syntax
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ Source supports these protocols: `http://`, `ftp://`, `puppet://`, `file://`

```puppet
wildfly::deployment { 'hawtio.war':
source => 'http://central.maven.org/maven2/io/hawt/hawtio-web/1.4.48/hawtio-web-1.4.48.war',
source => 'https://repo1.maven.org/maven2/io/hawt/hawtio-web/1.4.66/hawtio-web-1.4.66.war',
}
```

Expand All @@ -551,7 +551,7 @@ wildfly::deployment { 'hawtio.war':

```puppet
wildfly::deployment { 'hawtio.war':
source => 'http://central.maven.org/maven2/io/hawt/hawtio-web/1.4.48/hawtio-web-1.4.48.war',
source => 'https://repo1.maven.org/maven2/io/hawt/hawtio-web/1.4.66/hawtio-web-1.4.66.war',
server_group => 'main-server-group',
}
```
Expand Down Expand Up @@ -609,7 +609,7 @@ Install a JAR module from a remote file system, puppet file server or local file

```puppet
wildfly::config::module { 'org.postgresql':
source => 'http://central.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar',
source => 'https://repo1.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar',
dependencies => ['javax.api', 'javax.transaction.api']
}
```
Expand Down Expand Up @@ -654,7 +654,7 @@ Alternatively, you can install a JDBC driver and module using deployment if your

```puppet
wildfly::deployment { 'postgresql-9.3-1103-jdbc4.jar':
source => 'http://central.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar'
source => 'https://repo1.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar'
}
->
wildfly::datasources::datasource { 'DemoDS':
Expand All @@ -672,7 +672,7 @@ A postgresql normal & XA datasource example

```puppet
wildfly::config::module { 'org.postgresql':
source => 'http://central.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar',
source => 'https://repo1.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar',
dependencies => ['javax.api', 'javax.transaction.api'],
require => Class['wildfly'],
}
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/1_standalone_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class { 'wildfly':
}

wildfly::config::module { 'org.postgresql':
source => 'http://central.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar',
source => 'https://repo1.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar',
dependencies => ['javax.api', 'javax.transaction.api']
}
->
Expand Down
4 changes: 2 additions & 2 deletions spec/acceptance/2_deployment_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ class { 'wildfly':
}

wildfly::deployment { 'hawtio.war':
source => 'http://central.maven.org/maven2/io/hawt/hawtio-web/1.4.66/hawtio-web-1.4.66.war'
source => 'https://repo1.maven.org/maven2/io/hawt/hawtio-web/1.4.66/hawtio-web-1.4.66.war'
}

wildfly::deployment { 'sample.war':
source => 'http://central.maven.org/maven2/org/codehaus/cargo/simple-war/1.6.2/simple-war-1.6.2.war'
source => 'https://repo1.maven.org/maven2/org/codehaus/cargo/simple-war/1.6.2/simple-war-1.6.2.war'
}
EOS

Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/3_recursive_resource_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class { 'wildfly':
}

wildfly::config::module { 'org.postgresql':
source => 'http://central.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar',
source => 'https://repo1.maven.org/maven2/org/postgresql/postgresql/9.3-1103-jdbc4/postgresql-9.3-1103-jdbc4.jar',
dependencies => ['javax.api', 'javax.transaction.api'],
}
->
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/4_domain_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class { 'wildfly':
}

wildfly::deployment { 'hawtio.war':
source => 'http://central.maven.org/maven2/io/hawt/hawtio-web/1.4.66/hawtio-web-1.4.66.war',
source => 'https://repo1.maven.org/maven2/io/hawt/hawtio-web/1.4.66/hawtio-web-1.4.66.warhawtio-web-1.4.66.war',
server_group => 'main-server-group',
}

Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/5_domain_spec_custom_server_group.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class { 'wildfly':
}

wildfly::deployment { 'hawtio.war':
source => 'http://central.maven.org/maven2/io/hawt/hawtio-web/1.4.66/hawtio-web-1.4.66.war',
source => 'https://repo1.maven.org/maven2/io/hawt/hawtio-web/1.4.66/hawtio-web-1.4.66.war',
server_group => 'app-server-group',
}

Expand Down
9 changes: 4 additions & 5 deletions spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ def install_with_dependencies(host)
on host, puppet('module', 'install', 'jethrocarr-initfact')
end

def install_java(host)
def install_wget(host)
on host, puppet('resource', 'package', 'wget', 'ensure=installed')
on host, 'wget https://doc-0o-9c-docs.googleusercontent.com/docs/securesc/ha0ro937gcuc7l7deffksulhg5h7mbp1/7eelvqree5q8ski1d13625m75bahknja/1568980800000/18214363628765128033/*/1tkj8_kAFRCNxZLqOaqU6XRj6ac0iEjer?e=download -O /var/cache/wget/OpenJDK8U-jdk_x64_linux_hotspot_8u192b12.tar.gz && tar -C /opt -zxvf /var/cache/wget/OpenJDK8U-jdk_x64_linux_hotspot_8u192b12.tar.gz'
end

RSpec.configure do |c|
Expand All @@ -33,7 +32,7 @@ def install_java(host)
if master.nil?
hosts.each do |host|
install_with_dependencies(host)
install_java(host)
install_wget(host)
end
else
install_with_dependencies(master)
Expand All @@ -46,7 +45,7 @@ def install_java(host)
puppet_server_fqdn = fact_on('master', 'fqdn')

hosts.agents.each do |agent|
install_java(agent)
install_wget(agent)

config = {
'main' => {
Expand Down Expand Up @@ -87,6 +86,6 @@ def test_data
data['service_name'] = ENV['TEST_service_name']
end

data['java_home'] = '/opt/jdk8u192-b12/'
data['java_home'] = '/usr/lib/jvm/jre-1.8.0-openjdk'

RSpec.configuration.test_data = data