Skip to content

Commit

Permalink
Merge pull request #571 from Icinga/bug/pin-required-module-versions-570
Browse files Browse the repository at this point in the history
fix #570 Pin versions for travis of required puppet modules for puppet
  • Loading branch information
lbetz committed Jun 26, 2019
2 parents 91d8ccc + 10e5899 commit 6a5bd7c
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 8 deletions.
19 changes: 19 additions & 0 deletions .fixtures.puppet4.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
fixtures:
forge_modules:
stdlib:
repo: puppetlabs/stdlib
ref: 5.2.0
concat:
repo: puppetlabs/concat
ref: 5.3.0
apt:
repo: puppetlabs/apt
ref: 6.3.0
chocolatey:
repo: puppetlabs/chocolatey
zypprepo:
repo: puppet/zypprepo
yumrepo_core:
repo: "puppetlabs-yumrepo_core"
puppet_version: ">= 6.0.0"

17 changes: 11 additions & 6 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
fixtures:
forge_modules:
stdlib: "puppetlabs/stdlib"
concat: "puppetlabs/concat"
apt: "puppetlabs/apt"
chocolatey: "puppetlabs/chocolatey"
zypprepo: "puppet/zypprepo"
stdlib:
repo: puppetlabs/stdlib
concat:
repo: puppetlabs/concat
apt:
repo: puppetlabs/apt
chocolatey:
repo: puppetlabs/chocolatey
zypprepo:
repo: puppet/zypprepo
yumrepo_core:
repo: "puppetlabs-yumrepo_core"
repo: puppetlabs-yumrepo_core
puppet_version: ">= 6.0.0"

4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ matrix:
rvm: 2.4.5
stage: spec
-
env: PUPPET_VERSION="~> 4.10" CHECK=test PARALLEL_TEST_PROCESSORS=4
env: PUPPET_VERSION="~> 4.10" CHECK=test PARALLEL_TEST_PROCESSORS=4 FIXTURES_YML=.fixtures.puppet4.yml
rvm: 2.1.9
stage: spec
-
Expand All @@ -51,4 +51,4 @@ deploy:
on:
tags: true
all_branches: true
condition: "$DEPLOY_TO_FORGE = yes"
condition: "$DEPLOY_TO_FORGE = yes"

0 comments on commit 6a5bd7c

Please sign in to comment.