.github/workflows/acceptance.yml

@@ -23,6 +23,7 @@ jobs:
           bundle config path vendor/bundle
           bundle config without 'development test'
           bundle install --jobs 4 --retry 3
+
   acceptance:
     needs: build_cache
     runs-on: ubuntu-latest
@@ -31,18 +32,20 @@ jobs:
       matrix:
         setfile:
           - centos6-64{hostname=centos6-64.example.com}
+          - centos7-64{hostname=centos7-64.example.com,image=centos:7.6.1810}
+          - fedora31-64{hostname=fedora31-64.example.com}
           - debian9-64{hostname=debian9-64.example.com}
           - debian10-64{hostname=debian10-64.example.com}
-          - fedora31-64{hostname=fedora31-64.example.com}
+          - ubuntu1604-64{hostname=ubuntu1604-64.example.com,image=ubuntu:xenial-20191212}
           - ubuntu1804-64{hostname=ubuntu1804-64.example.com}
           - ubuntu2004-64{hostname=ubuntu2004-64.example.com}
         puppet:
           - "6"
           - "5"
         exclude:
-          - setfile: debian10-64{hostname=debian10-64.example.com}
+          - setfile: "debian10-64{hostname=debian10-64.example.com}"
             puppet: "5"
-          - setfile: ubuntu2004-64{hostname=ubuntu2004-64.example.com}
+          - setfile: "ubuntu2004-64{hostname=ubuntu2004-64.example.com}"
             puppet: "5"
     name: Puppet ${{ matrix.puppet }} - ${{ matrix.setfile }}
     steps:

.github/workflows/cron.yml

@@ -2,7 +2,7 @@ name: Nightly tests
 
 on:
   schedule:
-    - cron: '4 * * * *'
+    - cron: '4 4 * * *'
 
 jobs:
   unit:
@@ -71,6 +71,7 @@ jobs:
           bundle config path vendor/bundle
           bundle config without 'development test'
           bundle install --jobs 4 --retry 3
+
   acceptance:
     if: github.repository == 'theforeman/puppet-puppet'
     needs: build_cache
@@ -79,11 +80,22 @@ jobs:
       fail-fast: false
       matrix:
         setfile:
-          - centos7-64{hostname=centos7-64.example.com}
-          - centos8-64{hostname=centos8-64.example.com}
+          - centos6-64{hostname=centos6-64.example.com}
+          - centos7-64{hostname=centos7-64.example.com,image=centos:7.6.1810}
+          - fedora31-64{hostname=fedora31-64.example.com}
+          - debian9-64{hostname=debian9-64.example.com}
+          - debian10-64{hostname=debian10-64.example.com}
+          - ubuntu1604-64{hostname=ubuntu1604-64.example.com,image=ubuntu:xenial-20191212}
+          - ubuntu1804-64{hostname=ubuntu1804-64.example.com}
+          - ubuntu2004-64{hostname=ubuntu2004-64.example.com}
         puppet:
           - "6"
           - "5"
+        exclude:
+          - setfile: "debian10-64{hostname=debian10-64.example.com}"
+            puppet: "5"
+          - setfile: "ubuntu2004-64{hostname=ubuntu2004-64.example.com}"
+            puppet: "5"
     name: Puppet ${{ matrix.puppet }} - ${{ matrix.setfile }}
     steps:
       - name: Enable IPv6 on docker

.sync.yml

@@ -1,18 +1,18 @@
 ---
-.travis.yml:
-  beaker_sets:
-    - centos6-64
-    - debian9-64
-    - debian10-64
-    - fedora31-64
-    - ubuntu1804-64
-    - ubuntu2004-64
-  env:
-    global:
-      - PARALLEL_TEST_PROCESSORS=8
-  beaker_puppet_collections:
-    - puppet5
-    - puppet6
+.github/workflows/acceptance.yml:
+  excludes:
+    - setfile: debian10-64{hostname=debian10-64.example.com}
+      puppet: "5"
+    - setfile: ubuntu2004-64{hostname=ubuntu2004-64.example.com}
+      puppet: "5"
+  pidfile_workaround: true
+.github/workflows/cron.yml:
+  excludes:
+    - setfile: debian10-64{hostname=debian10-64.example.com}
+      puppet: "5"
+    - setfile: ubuntu2004-64{hostname=ubuntu2004-64.example.com}
+      puppet: "5"
+  pidfile_workaround: true
 Gemfile:
   extra:
     - gem: hocon

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [14.2.1](https://github.com/theforeman/puppet-puppet/tree/14.2.1) (2021-01-26)
+
+[Full Changelog](https://github.com/theforeman/puppet-puppet/compare/14.2.0...14.2.1)
+
+**Fixed bugs:**
+
+- run Puppet agent from systemd only after network is brought up [\#765](https://github.com/theforeman/puppet-puppet/pull/765) ([anarcat](https://github.com/anarcat))
+
 ## [14.2.0](https://github.com/theforeman/puppet-puppet/tree/14.2.0) (2020-10-29)
 
 [Full Changelog](https://github.com/theforeman/puppet-puppet/compare/14.1.0...14.2.0)

Gemfile

@@ -3,15 +3,16 @@
 
 source 'https://rubygems.org'
 
-gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '>= 5.5'
+gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '>= 5.5', groups: ['development', 'test']
+gem 'rake'
 
-gem 'kafo_module_lint'
-gem 'puppet-lint-empty_string-check'
-gem 'puppet-lint-file_ensure-check'
-gem 'puppet-lint-param-docs', '>= 1.3.0'
-gem 'puppet-lint-spaceship_operator_without_tag-check'
-gem 'puppet-lint-strict_indent-check'
-gem 'puppet-lint-undef_in_function-check'
+gem 'kafo_module_lint', {"groups"=>["test"]}
+gem 'puppet-lint-empty_string-check', {"groups"=>["test"]}
+gem 'puppet-lint-file_ensure-check', {"groups"=>["test"]}
+gem 'puppet-lint-param-docs', '>= 1.3.0', {"groups"=>["test"]}
+gem 'puppet-lint-spaceship_operator_without_tag-check', {"groups"=>["test"]}
+gem 'puppet-lint-strict_indent-check', {"groups"=>["test"]}
+gem 'puppet-lint-undef_in_function-check', {"groups"=>["test"]}
 gem 'voxpupuli-test', '~> 1.4'
 gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
 gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-puppet",
-  "version": "14.2.0",
+  "version": "14.2.1",
   "author": "theforeman",
   "summary": "Puppet agent and server configuration",
   "license": "GPL-3.0+",

spec/setup_acceptance_node.pp

@@ -1,5 +1,6 @@
 $packages = $facts['os']['name'] ? {
-  'Fedora' => ['cronie'],
+  # iproute is needed for the ss command in testing and not included in the base container
+  'Fedora' => ['cronie', 'iproute'],
   'Ubuntu' => ['cron'],
   default  => [],
 }

templates/agent/systemd.puppet-run.service.erb

@@ -3,6 +3,7 @@
 #
 [Unit]
 Description=Systemd Timer Service for Puppet Agent
+After=network.target
 
 [Service]
 Type=oneshot