.fixtures.yml

@@ -1,3 +1,7 @@
 fixtures:
   symlinks:
     reboot: "#{source_dir}"
+  repositories:
+    facts: 'git://github.com/puppetlabs/puppetlabs-facts.git'
+    puppet_agent: 'git://github.com/puppetlabs/puppetlabs-puppet_agent.git'
+    provision: 'git://github.com/puppetlabs/provision.git'

.github/pull_request_template.md

@@ -3,13 +3,13 @@ BEFORE YOU CREATE A PULL REQUEST:
 
 Ensure you have read over
 
-CONTRIBUTING - https://github.com/puppetlabs/puppetlabs-reboot/blob/master/CONTRIBUTING.md
+CONTRIBUTING - https://github.com/puppetlabs/puppetlabs-reboot/blob/main/CONTRIBUTING.md
 
 We provide defined guidance (as such, we strongly adhere to it).
 
 A summary of our expectations:
  - A ticket was created at https://tickets.puppetlabs.com/secure/CreateIssueDetails!init.jspa?pid=10707&issuetype=1&components=12016&summary=%5BREBOOT%5D%20, or you have an existing ticket #
- - You are not submitting a pull request from your MASTER branch.
+ - You are not submitting a pull request from your MAIN branch.
  - The first line of your  git commit message has the ticket # and a short summary of the fix, followed by a detailed explanation of the fix in the git commit body.
  - Your git commit message format is important. We have a very defined expectation for this format and are keep to it. Really, READ the entire Contributing document. It will save you and us time.
  - Do not reformat code, it makes it hard to see what has changed. Leave the formatting to us.

.github/workflows/weekly.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Litmus Parallel
-      uses: puppetlabs/action-litmus_parallel@master
+      uses: puppetlabs/action-litmus_parallel@main
       with:
         platform: ${{ matrix.platform }}
         agent_family: ${{ matrix.agent_family }}
@@ -36,7 +36,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Spec Tests
-      uses: puppetlabs/action-litmus_spec@master
+      uses: puppetlabs/action-litmus_spec@main
       with:
         puppet_gem_version: ${{ matrix.puppet_gem_version }}
         check: ${{ matrix.check }}

.rubocop.yml

@@ -465,8 +465,6 @@ Style/BlockComments:
   Enabled: false
 Style/BlockDelimiters:
   Enabled: false
-Style/BracesAroundHashParameters:
-  Enabled: false
 Style/CaseEquality:
   Enabled: false
 Style/CharacterLiteral:

.sync.yml

@@ -5,6 +5,9 @@
   include_todos: true
   selected_profile: false
 ".travis.yml":
+  stages:
+    - static
+    - spec
   deploy_to_forge:
     enabled: false
   global_env:
@@ -18,6 +21,8 @@ appveyor.yml:
   environment:
     HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
     HONEYCOMB_DATASET: litmus tests
+  use_litmus: true
+  spec_type: spec
   matrix_extras:
   - PUPPET_GEM_VERSION: "~> 6.0"
     RUBY_VERSION: 25
@@ -28,43 +33,26 @@ appveyor.yml:
   simplecov: true
 Gemfile:
   required:
-    ":development":
-    - gem: bolt
-      version: "~> 1.3"
-      condition: ENV['GEM_BOLT'] and ENV['PUPPET_GEM_VERSION'] != "~> 5.0"
     ":system_tests":
-    - gem: puppet-module-posix-system-r#{minor_version}
-      platforms: ruby
-    - gem: puppet-module-win-system-r#{minor_version}
-      platforms:
-      - mswin
-      - mingw
-      - x64_mingw
-    - gem: beaker-testmode_switcher
-      version: "~> 0.4"
-    - gem: master_manipulator
-    - gem: puppet-blacksmith
-      version: "~> 3.4"
-    - gem: beaker-task_helper
-      version: "~> 1.5"
-      condition: ENV['GEM_BOLT']
+      - gem: ed25519
   optional:
     ":development":
-    - gem: github_changelog_generator
-      git: https://github.com/skywinder/github-changelog-generator
-      ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
-      condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
+      - gem: bolt
+        version: ">= 1.3"
+        condition: ENV['GEM_BOLT'] and ENV['PUPPET_GEM_VERSION'] != "~> 5.0"
+      - gem: github_changelog_generator
+        git: https://github.com/skywinder/github-changelog-generator
+        ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
+        condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 Rakefile:
   changelog_user: puppetlabs
   changelog_since_tag: 2.1.2
   extras: |
-    # The beaker task requires the test fixtures created by the spec_prep task
-    beaker_task_exists = Rake::Task.task_defined?('beaker')
-    spec_prep_task_exists = Rake::Task.task_defined?('spec_prep')
-    if beaker_task_exists && spec_prep_task_exists
-      beaker_task = Rake::Task['beaker']
-      spec_prep =  Rake::Task['spec_prep']
-      beaker_task.enhance(beaker_task.prerequisite_tasks << spec_prep)
+    if Rake::Task.task_defined?('spec_prep')
+      Rake::Task.tasks.each do |task|
+        next unless task.name.start_with? 'litmus:acceptance'
+        task.enhance([Rake::Task['spec_prep']])
+      end
     end
 spec/spec_helper.rb:
   coverage_report: true

.travis.yml

@@ -1,4 +1,5 @@
 ---
+os: linux
 dist: xenial
 language: ruby
 cache: bundler
@@ -15,7 +16,7 @@ script:
   - 'SIMPLECOV=yes bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
-  - 2.5.3
+  - 2.5.7
 env:
   global:
     - GEM_BOLT=true
@@ -24,7 +25,7 @@ stages:
   - static
   - spec
   - acceptance
-matrix:
+jobs:
   fast_finish: true
   include:
     -
@@ -36,11 +37,11 @@ matrix:
       stage: spec
     -
       env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
-      rvm: 2.5.3
+      rvm: 2.5.7
       stage: spec
 branches:
   only:
-    - master
+    - main
     - /^v\d/
 notifications:
   email: false

.vscode/extensions.json

@@ -1,6 +1,6 @@
 {
   "recommendations": [
-    "jpogran.puppet-vscode",
+    "puppet.puppet-vscode",
     "rebornix.Ruby"
   ]
 }

CHANGELOG.md

@@ -2,7 +2,15 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v3.0.0](https://github.com/puppetlabs/puppetlabs-reboot/tree/v3.0.0) (2020-02-25)
+## [v3.1.0](https://github.com/puppetlabs/puppetlabs-reboot/tree/v3.1.0) (2020-11-17)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-reboot/compare/v3.0.0...v3.1.0)
+
+### Added
+
+- pdksync - \(IAC-973\) - Update travis/appveyor to run on new default branch `main` [\#253](https://github.com/puppetlabs/puppetlabs-reboot/pull/253) ([david22swan](https://github.com/david22swan))
+
+## [v3.0.0](https://github.com/puppetlabs/puppetlabs-reboot/tree/v3.0.0) (2020-02-27)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-reboot/compare/v2.4.0...v3.0.0)
 
@@ -31,7 +39,6 @@ All notable changes to this project will be documented in this file. The format
 ### Fixed
 
 - Fix reboot message for linux hosts [\#213](https://github.com/puppetlabs/puppetlabs-reboot/pull/213) ([nmaludy](https://github.com/nmaludy))
-- \[MODULES-8718\] Check for root or sudo in the reboot task nix.sh script [\#203](https://github.com/puppetlabs/puppetlabs-reboot/pull/203) ([thilinapiy](https://github.com/thilinapiy))
 
 ## [2.2.0](https://github.com/puppetlabs/puppetlabs-reboot/tree/2.2.0) (2019-07-24)
 
@@ -51,6 +58,7 @@ All notable changes to this project will be documented in this file. The format
 ### Fixed
 
 - Add additional guards for nix process detach [\#210](https://github.com/puppetlabs/puppetlabs-reboot/pull/210) ([reidmv](https://github.com/reidmv))
+- \[MODULES-8718\] Check for root or sudo in the reboot task nix.sh script [\#203](https://github.com/puppetlabs/puppetlabs-reboot/pull/203) ([thilinapiy](https://github.com/thilinapiy))
 - \(MODULES-8717\) Fix dependency issue on boltspec [\#202](https://github.com/puppetlabs/puppetlabs-reboot/pull/202) ([HelenCampbell](https://github.com/HelenCampbell))
 
 # Changelog

Gemfile

@@ -28,16 +28,11 @@ group :development do
   gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4',     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}", '~> 0.4',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "bolt", '~> 1.3',                                          require: false if ENV['GEM_BOLT'] and ENV['PUPPET_GEM_VERSION'] != "~> 5.0"
+  gem "bolt", '>= 1.3',                                          require: false if ENV['GEM_BOLT'] and ENV['PUPPET_GEM_VERSION'] != "~> 5.0"
   gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 end
 group :system_tests do
-  gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
-  gem "puppet-module-win-system-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "beaker-testmode_switcher", '~> 0.4',           require: false
-  gem "master_manipulator",                           require: false
-  gem "puppet-blacksmith", '~> 3.4',                  require: false
-  gem "beaker-task_helper", '~> 1.5',                 require: false if ENV['GEM_BOLT']
+  gem "ed25519", require: false
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']

README.md

@@ -1,5 +1,5 @@
 # reboot
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-reboot.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-reboot)
+[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-reboot.png?branch=main)](https://travis-ci.org/puppetlabs/puppetlabs-reboot)
 
 #### Table of Contents
 
@@ -273,7 +273,7 @@ plan myapp::patch (
 
 ## Limitations
 
-For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-reboot/blob/master/metadata.json)
+For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-reboot/blob/main/metadata.json)
 
 ## Development
 

Rakefile

@@ -53,46 +53,43 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
     config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
     config.add_pr_wo_labels = true
     config.issues = false
-    config.merge_prefix = "### UNCATEGORIZED PRS; GO LABEL THEM"
+    config.merge_prefix = "### UNCATEGORIZED PRS; LABEL THEM ON GITHUB"
     config.configure_sections = {
       "Changed" => {
         "prefix" => "### Changed",
         "labels" => ["backwards-incompatible"],
       },
       "Added" => {
         "prefix" => "### Added",
-        "labels" => ["feature", "enhancement"],
+        "labels" => ["enhancement", "feature"],
       },
       "Fixed" => {
         "prefix" => "### Fixed",
-        "labels" => ["bugfix"],
+        "labels" => ["bug", "documentation", "bugfix"],
       },
     }
   end
 else
   desc 'Generate a Changelog from GitHub'
   task :changelog do
     raise <<EOM
-The changelog tasks depends on unreleased features of the github_changelog_generator gem.
+The changelog tasks depends on recent features of the github_changelog_generator gem.
 Please manually add it to your .sync.yml for now, and run `pdk update`:
 ---
 Gemfile:
   optional:
     ':development':
       - gem: 'github_changelog_generator'
-        git: 'https://github.com/skywinder/github-changelog-generator'
-        ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
-        condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
+        version: '~> 1.15'
+        condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')"
 EOM
   end
 end
 
-# The beaker task requires the test fixtures created by the spec_prep task
-beaker_task_exists = Rake::Task.task_defined?('beaker')
-spec_prep_task_exists = Rake::Task.task_defined?('spec_prep')
-if beaker_task_exists && spec_prep_task_exists
-  beaker_task = Rake::Task['beaker']
-  spec_prep =  Rake::Task['spec_prep']
-  beaker_task.enhance(beaker_task.prerequisite_tasks << spec_prep)
+if Rake::Task.task_defined?('spec_prep')
+  Rake::Task.tasks.each do |task|
+    next unless task.name.start_with? 'litmus:acceptance'
+    task.enhance([Rake::Task['spec_prep']])
+  end
 end
 

appveyor.yml

@@ -2,7 +2,7 @@
 version: 1.1.x.{build}
 branches:
   only:
-    - master
+    - main
     - release
 skip_commits:
   message: /^\(?doc\)?.*/
@@ -24,27 +24,43 @@ environment:
     -
       PUPPET_GEM_VERSION: ~> 5.0
       RUBY_VERSION: 24
-      CHECK: parallel_spec
+      CHECK: spec
     -
       PUPPET_GEM_VERSION: ~> 5.0
       RUBY_VERSION: 24-x64
-      CHECK: parallel_spec
+      CHECK: spec
     -
       PUPPET_GEM_VERSION: ~> 6.0
       RUBY_VERSION: 25
-      CHECK: parallel_spec
+      CHECK: spec
     -
       PUPPET_GEM_VERSION: ~> 6.0
       RUBY_VERSION: 25-x64
-      CHECK: parallel_spec
+      CHECK: spec
     -
       PUPPET_GEM_VERSION: ~> 6.0
       RUBY_VERSION: 25
-      CHECK: parallel_spec
+      CHECK: spec
     -
       PUPPET_GEM_VERSION: ~> 6.0
       RUBY_VERSION: 25-x64
-      CHECK: parallel_spec
+      CHECK: spec
+for:
+-
+  matrix:
+    only:
+      - ACCEPTANCE: yes
+  install:
+    - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+    - bundle install --jobs 4 --retry 2
+    - type Gemfile.lock
+  test_script:
+    - bundle exec puppet -V
+    - ruby -v
+    - gem -v
+    - bundle -v
+    - bundle exec rake spec_prep
+    - bundle exec rake litmus:acceptance:localhost
 matrix:
   fast_finish: true
 install:

metadata.json

@@ -1,7 +1,7 @@
 {
   "name": "puppetlabs-reboot",
-  "version": "3.0.0",
-  "author": "Puppet Inc",
+  "version": "3.1.0",
+  "author": "puppetlabs",
   "summary": "Adds a type and provider for managing system reboots.",
   "license": "Apache-2.0",
   "source": "git://github.com/puppetlabs/puppetlabs-reboot",
@@ -96,7 +96,7 @@
     }
   ],
   "description": "This module provides a facility for managing reboots across nodes.",
-  "pdk-version": "1.16.0",
-  "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-g5d52853"
+  "pdk-version": "1.18.1",
+  "template-url": "https://github.com/puppetlabs/pdk-templates#main",
+  "template-ref": "heads/main-0-gd610ead"
 }