Page MenuHomeSoftware Heritage
Files F9125312

No OneTemporary
Actions

View Options

diff --git a/.travis.yml b/.travis.yml
index d60d3d40..38115786 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,108 +1,121 @@
---
+os: linux
dist: xenial
language: ruby
cache: bundler
before_install:
- bundle -v
- rm -f Gemfile.lock
- "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
- "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
- "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
- '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
- gem --version
- bundle -v
script:
- 'SIMPLECOV=yes bundle exec rake $CHECK'
bundler_args: --without system_tests
rvm:
- 2.5.3
env:
global:
- HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
stages:
- static
- spec
- acceptance
-matrix:
+jobs:
fast_finish: true
include:
-
- env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
- stage: static
- -
- env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
- rvm: 2.4.5
- stage: spec
- -
- env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
- rvm: 2.5.3
- stage: spec
- -
- before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
+ before_script:
+ - "bundle exec rake 'litmus:provision_list[travis_deb]'"
+ - "bundle exec rake 'litmus:install_agent[puppet5]'"
+ - "bundle exec rake litmus:install_module"
bundler_args:
dist: trusty
- env: PLATFORMS=deb_puppet5
+ env: PLATFORMS=travis_deb_puppet5
rvm: 2.5.3
script: ["bundle exec rake litmus:acceptance:parallel"]
services: docker
stage: acceptance
- sudo: required
-
- before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
+ before_script:
+ - "bundle exec rake 'litmus:provision_list[travis_ub]'"
+ - "bundle exec rake 'litmus:install_agent[puppet5]'"
+ - "bundle exec rake litmus:install_module"
bundler_args:
dist: trusty
- env: PLATFORMS=deb_puppet6
+ env: PLATFORMS=travis_ub_puppet5
rvm: 2.5.3
script: ["bundle exec rake litmus:acceptance:parallel"]
services: docker
stage: acceptance
- sudo: required
-
- before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
+ before_script:
+ - "bundle exec rake 'litmus:provision_list[travis_el7]'"
+ - "bundle exec rake 'litmus:install_agent[puppet5]'"
+ - "bundle exec rake litmus:install_module"
bundler_args:
dist: trusty
- env: PLATFORMS=ub_puppet5
+ env: PLATFORMS=travis_el7_puppet5
rvm: 2.5.3
script: ["bundle exec rake litmus:acceptance:parallel"]
services: docker
stage: acceptance
- sudo: required
-
- before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
+ before_script:
+ - "bundle exec rake 'litmus:provision_list[travis_deb]'"
+ - "bundle exec rake 'litmus:install_agent[puppet6]'"
+ - "bundle exec rake litmus:install_module"
bundler_args:
dist: trusty
- env: PLATFORMS=ub_puppet6
+ env: PLATFORMS=travis_deb_puppet6
rvm: 2.5.3
script: ["bundle exec rake litmus:acceptance:parallel"]
services: docker
stage: acceptance
- sudo: required
-
- before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
+ before_script:
+ - "bundle exec rake 'litmus:provision_list[travis_ub]'"
+ - "bundle exec rake 'litmus:install_agent[puppet6]'"
+ - "bundle exec rake litmus:install_module"
bundler_args:
dist: trusty
- env: PLATFORMS=el7_puppet5
+ env: PLATFORMS=travis_ub_puppet6
rvm: 2.5.3
script: ["bundle exec rake litmus:acceptance:parallel"]
services: docker
stage: acceptance
- sudo: required
-
- before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
+ before_script:
+ - "bundle exec rake 'litmus:provision_list[travis_el7]'"
+ - "bundle exec rake 'litmus:install_agent[puppet6]'"
+ - "bundle exec rake litmus:install_module"
bundler_args:
dist: trusty
- env: PLATFORMS=el7_puppet6
+ env: PLATFORMS=travis_el7_puppet6
rvm: 2.5.3
script: ["bundle exec rake litmus:acceptance:parallel"]
services: docker
stage: acceptance
- sudo: required
+ -
+ env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
+ stage: static
+ -
+ env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
+ rvm: 2.4.5
+ stage: spec
+ -
+ env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
+ rvm: 2.5.3
+ stage: spec
branches:
only:
- master
- /^v\d/
- release
notifications:
email: false
slack:
secure: MrXQwGIUO7WNmLbe7iiWgURiZPUgyvDLkKe3d9S58ohE6gdN6pqlsjP8YgodK8JmIBV1zp5Wj/0cXUmY3xvCtnDmII0DCEk2Y1Cs/W1drKZtS/0BsUpJkj0rDP2fSlKsY5ifESdEta/y8+NkjRnqadbl7SQPYeek4IjAfxjjuig=
diff --git a/metadata.json b/metadata.json
index f4b8440c..fa81197e 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,88 +1,88 @@
{
"name": "puppetlabs-apache",
"version": "5.4.0",
"author": "puppetlabs",
"summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
"license": "Apache-2.0",
"source": "https://github.com/puppetlabs/puppetlabs-apache",
"project_page": "https://github.com/puppetlabs/puppetlabs-apache",
"issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
"dependencies": [
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 4.13.1 < 7.0.0"
},
{
"name": "puppetlabs/concat",
"version_requirement": ">= 2.2.1 < 7.0.0"
}
],
"operatingsystem_support": [
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"5",
"6",
"7",
"8"
]
},
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"5",
"6",
"7",
"8"
]
},
{
"operatingsystem": "OracleLinux",
"operatingsystemrelease": [
"6",
"7"
]
},
{
"operatingsystem": "Scientific",
"operatingsystemrelease": [
"6",
"7"
]
},
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"8",
"9",
"10"
]
},
{
"operatingsystem": "SLES",
"operatingsystemrelease": [
"11 SP1",
"12",
"15"
]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"14.04",
"16.04",
"18.04"
]
}
],
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 5.5.10 < 7.0.0"
}
],
"description": "Module for Apache configuration",
"pdk-version": "1.16.0",
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
- "template-ref": "heads/master-0-g5d52853"
+ "template-ref": "heads/master-0-g88c96ab"
}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Jun 21, 8:29 PM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3344065

Event Timeline

About · Developer information · Legal