Skip to content

Commit 23c31f1

Browse files
hunnerhunner
committed
Merge pull request #91 from eputnam/travissync
this commit updates travis to drop puppet 3 testing and adds sync.yml
2 parents f1bdf56 + e6b6ce6 commit 23c31f1

File tree

7 files changed

+60
-57
lines changed

7 files changed

+60
-57
lines changed

‎.sync.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
appveyor.yml:
3+
delete: true

‎.travis.yml‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,31 @@
11
---
2-
branches:
3-
only:
4-
- master
2+
sudo: false
53
language: ruby
6-
bundler_args: --without development
7-
script: "bundle exec rake syntax lint spec SPEC_OPTS='--format documentation'"
8-
4+
cache: bundler
5+
script: "bundle exec rake release_checks"
6+
#Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
7+
before_install:
8+
- gem update bundler
99
matrix:
1010
fast_finish: true
1111
include:
12-
- rvm: 2.1.6
12+
- rvm: 2.3.1
1313
dist: trusty
1414
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
1515
script: bundle exec rake beaker
1616
services: docker
1717
sudo: required
18-
- rvm: 2.1.6
18+
- rvm: 2.3.1
1919
dist: trusty
2020
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
2121
script: bundle exec rake beaker
2222
services: docker
2323
sudo: required
24-
- rvm: 2.1.9
24+
- rvm: 2.3.1
2525
bundler_args: --without system_tests
26-
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
27-
- rvm: 2.1.5
26+
env: PUPPET_GEM_VERSION="~> 4.0"
27+
- rvm: 2.1.7
2828
bundler_args: --without system_tests
29-
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
30-
- rvm: 2.1.5
31-
bundler_args: --without system_tests
32-
env: PUPPET_GEM_VERSION="~> 3.0"
29+
env: PUPPET_GEM_VERSION="~> 4.0"
3330
notifications:
3431
email: false
35-

‎tests/init.pp‎ renamed to ‎examples/init.pp‎

File renamed without changes.

‎tests/repo.pp‎ renamed to ‎examples/repo.pp‎

File renamed without changes.

‎tests/server_with_motd.pp‎ renamed to ‎examples/server_with_motd.pp‎

File renamed without changes.

‎manifests/get.pp‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -56,76 +56,78 @@
5656
}
5757

5858
if $user {
59-
$myUser = "-e 'ssh -i ${mykeyfile} -l ${user}' ${user}@"
59+
$myuser = "-e 'ssh -i ${mykeyfile} -l ${user}' ${user}@"
6060
} else {
61-
$myUser = undef
61+
$myuser = undef
6262
}
6363

6464
if $purge {
65-
$myPurge = '--delete'
65+
$mypurge = '--delete'
6666
} else {
67-
$myPurge = undef
67+
$mypurge = undef
6868
}
6969

7070
if $exclude {
71-
$myExclude = join(prefix(flatten([$exclude]), '--exclude='), ' ')
71+
$myexclude = join(prefix(flatten([$exclude]), '--exclude='), ' ')
7272
} else {
73-
$myExclude = undef
73+
$myexclude = undef
7474
}
7575

7676
if $include {
77-
$myInclude = join(prefix(flatten([$include]), '--include='), ' ')
77+
$myinclude = join(prefix(flatten([$include]), '--include='), ' ')
7878
} else {
79-
$myInclude = undef
79+
$myinclude = undef
8080
}
8181

8282
if $recursive {
83-
$myRecursive = '-r'
83+
$myrecursive = '-r'
8484
} else {
85-
$myRecursive = undef
85+
$myrecursive = undef
8686
}
8787

8888
if $links {
89-
$myLinks = '--links'
89+
$mylinks = '--links'
9090
} else {
91-
$myLinks = undef
91+
$mylinks = undef
9292
}
9393

9494
if $hardlinks {
95-
$myHardLinks = '--hard-links'
95+
$myhardlinks = '--hard-links'
9696
} else {
97-
$myHardLinks = undef
97+
$myhardlinks = undef
9898
}
9999

100100
if $copylinks {
101-
$myCopyLinks = '--copy-links'
101+
$mycopylinks = '--copy-links'
102102
} else {
103-
$myCopyLinks = undef
103+
$mycopylinks = undef
104104
}
105105

106106
if $times {
107-
$myTimes = '--times'
107+
$mytimes = '--times'
108108
} else {
109-
$myTimes = undef
109+
$mytimes = undef
110110
}
111111

112112
if $chown {
113-
$myChown = "--chown=${chown}"
113+
$mychown = "--chown=${chown}"
114114
} else {
115-
$myChown = undef
115+
$mychown = undef
116116
}
117117

118118
if $include or $exclude {
119119
if $exclude_first {
120-
$excludeAndInclude = join(delete_undef_values([$myExclude, $myInclude]), ' ')
120+
$excludeandinclude = join(delete_undef_values([$myexclude, $myinclude]), ' ')
121121
} else {
122-
$excludeAndInclude = join(delete_undef_values([$myInclude, $myExclude]), ' ')
122+
$excludeandinclude = join(delete_undef_values([$myinclude, $myexclude]), ' ')
123123
}
124+
} else {
125+
$excludeandinclude = undef
124126
}
125127

126128
$rsync_options = join(
127-
delete_undef_values([$options, $myPurge, $excludeAndInclude, $myLinks, $myHardLinks, $myCopyLinks, $myTimes,
128-
$myRecursive, $myChown, "${myUser}${source}", $path]), ' ')
129+
delete_undef_values([$options, $mypurge, $excludeandinclude, $mylinks, $myhardlinks, $mycopylinks, $mytimes,
130+
$myrecursive, $mychown, "${myuser}${source}", $path]), ' ')
129131

130132
if !$onlyif {
131133
$onlyif_real = "test `rsync --dry-run --itemize-changes ${rsync_options} | wc -l` -gt 0"

‎manifests/put.pp‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,53 +40,55 @@
4040
) {
4141

4242
if $keyfile {
43-
$myKeyfile = $keyfile
43+
$mykeyfile = $keyfile
4444
} else {
45-
$myKeyfile = "/home/${user}/.ssh/id_rsa"
45+
$mykeyfile = "/home/${user}/.ssh/id_rsa"
4646
}
4747

4848
if $user {
49-
$myUserOpt = "-e 'ssh -i ${myKeyfile} -l ${user}'"
50-
$myUser = "${user}@"
49+
$myuseropt = "-e 'ssh -i ${mykeyfile} -l ${user}'"
50+
$myuser = "${user}@"
5151
} else {
52-
$myUserOpt = undef
53-
$myUser = undef
52+
$myuseropt = undef
53+
$myuser = undef
5454
}
5555

5656
if $purge {
57-
$myPurge = '--delete'
57+
$mypurge = '--delete'
5858
} else {
59-
$myPurge = undef
59+
$mypurge = undef
6060
}
6161

6262
if $exclude {
63-
$myExclude = join(prefix(flatten([$exclude]), '--exclude='), ' ')
63+
$myexclude = join(prefix(flatten([$exclude]), '--exclude='), ' ')
6464
} else {
65-
$myExclude = undef
65+
$myexclude = undef
6666
}
6767

6868
if $include {
69-
$myInclude = join(prefix(flatten([$include]), '--include='), ' ')
69+
$myinclude = join(prefix(flatten([$include]), '--include='), ' ')
7070
} else {
71-
$myInclude = undef
71+
$myinclude = undef
7272
}
7373

7474
if $include or $exclude {
7575
if $exclude_first {
76-
$excludeAndInclude = join(delete_undef_values([$myExclude, $myInclude]), ' ')
76+
$excludeandinclude = join(delete_undef_values([$myexclude, $myinclude]), ' ')
7777
} else {
78-
$excludeAndInclude = join(delete_undef_values([$myInclude, $myExclude]), ' ')
78+
$excludeandinclude = join(delete_undef_values([$myinclude, $myexclude]), ' ')
7979
}
80+
} else {
81+
$excludeandinclude = undef
8082
}
8183

8284
if $path {
83-
$myPath = $path
85+
$mypath = $path
8486
} else {
85-
$myPath = $name
87+
$mypath = $name
8688
}
8789

8890
$rsync_options = join(
89-
delete_undef_values([$options, $myPurge, $excludeAndInclude, $myUserOpt, $source, "${myUser}${myPath}"]), ' ')
91+
delete_undef_values([$options, $mypurge, $excludeandinclude, $myuseropt, $source, "${myuser}${mypath}"]), ' ')
9092

9193
exec { "rsync ${name}":
9294
command => "rsync -q ${rsync_options}",

0 commit comments

Comments
 (0)