Skip to content

Commit 0dc71a6

Browse files
(maint) modulesync 65530a4 Update Travis
Related: puppetlabs/modulesync_configs#177
1 parent ea7a3e2 commit 0dc71a6

3 files changed

Lines changed: 14 additions & 22 deletions

File tree

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ sudo: false
44
language: ruby
55
cache: bundler
66
script: "bundle exec rake release_checks"
7-
#Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
8-
before_install:
9-
- gem update bundler
107
matrix:
118
fast_finish: true
129
include:

NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Puppet Module - puppetlabs-acl
22

3-
Copyright 2013 - 2017 Puppet, Inc.
3+
Copyright 2013 - 2018 Puppet, Inc.
44

55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
1+
---
12
HOSTS:
2-
centos7-master:
3-
roles:
4-
- master
5-
- database
6-
- dashboard
7-
platform: el-7-x86_64
8-
template: centos-7-x86_64
9-
hypervisor: vcloud
10-
win2012:
11-
roles:
12-
- agent
13-
- default
14-
platform: windows-2012-x86_64
3+
windows2012-64-1:
4+
pe_dir:
5+
pe_ver:
6+
pe_upgrade_dir:
7+
pe_upgrade_ver:
8+
hypervisor: vmpooler
9+
platform: windows-2012-64
10+
ruby_arch: x64
1511
template: win-2012-x86_64
16-
hypervisor: vcloud
12+
roles:
13+
- agent
14+
- default
1715
CONFIG:
1816
nfs_server: none
1917
consoleport: 443
20-
datastore: instance0
21-
folder: Delivery/Quality Assurance/FOSS/Dynamic
22-
resourcepool: delivery/Quality Assurance/FOSS/Dynamic
23-
pooling_api: http://vcloud.delivery.puppetlabs.net/
18+
pooling_api: http://vmpooler.delivery.puppetlabs.net/

0 commit comments

Comments
 (0)