Merge remote-tracking branch 'upstream/master' into manage_releases

.github/SECURITY.md

@@ -0,0 +1,3 @@
+# Vox Pupuli Security Policy
+
+Our vulnerabilities reporting process is at https://voxpupuli.org/security/

.msync.yml

@@ -1 +1 @@
-modulesync_config_version: '2.12.0'
+modulesync_config_version: '3.0.0'

.rubocop.yml

@@ -528,6 +528,9 @@ RSpec/RepeatedDescription:
 RSpec/NestedGroups:
   Enabled: False
 
+RSpec/MultipleExpectations:
+  Enabled: false
+
 # this is broken on ruby1.9
 Layout/IndentHeredoc:
   Enabled: False

.travis.yml

@@ -1,4 +1,5 @@
 ---
+os: linux
 dist: bionic
 language: ruby
 cache: bundler
@@ -9,7 +10,7 @@ before_install:
   - scripts/start-gitlab.sh
 script:
   - 'bundle exec rake $CHECK'
-matrix:
+jobs:
   fast_finish: true
   include:
   - rvm: 2.4.4
@@ -102,7 +103,7 @@ notifications:
       - "chat.freenode.org#voxpupuli-notifications"
 deploy:
   provider: puppetforge
-  user: puppet
+  username: puppet
   password:
     secure: "uwKQeb0ngonWkgYCFTgrzALAOhjlTBXmJMTdB37z/E9cdFRqwDJy6aUpgXTMCareaiEUaKnkPW0+nNRZZl+ewA7JOb1oBqx2rYNf1URX+eRQLT5yZjD+9h2r1pSNId3ku45q4WhtWRsZ/foD3iPM+S 2g2BI28Ui4/AZYvz//YBa9uWpxVb1pqr2x6aAWxfh3pIGAiok8YnsYZ3qoW0MheGAcL4ReLsdQD9+eSUHYx+eA0zHvMbBVpdTnwFbEgD0WLV5bhaNShHBYWLrOKrYZFsd+XZjOyC8jDiYReeo219KHjDd5RZL38FC8Mtg+oHjUKUvvq2GEKDpPGq1BJ3opBChYbPfRx4KVQpYBeYap9PtkE2s9rSbvsARYVELl9nVoW0j2+nZYhL94efXieEiX/Qt/rwyR9YFvuRO71hzA4nIIaC11pz+kLm1uzJsLgd5tVAlUQjhjvUecRdL98XoI0WTGm3l4sT/ptqfdRvP4XJj0jN4twEQ6FKKUAQ0oaPOZwM2HF4YRN9PtijqU1VoZsUEpYtJECGQjrWEADpYD4qpRxpgGw/4/k/McRFegLC1oCSNqB2uiZIqyTmcr9X5ycNkG0yis4Koq+Chc4CXgZTOAwa2AgzUI8qPdBTI/1G1CBSiGta1X5MKHQM2yEgj2G0jnDAFhi5Im1ylYjBb5O+k="
   on:

Gemfile

@@ -11,10 +11,10 @@ def location_for(place, fake_version = nil)
 end
 
 group :test do
-  gem 'voxpupuli-test', '>= 1.0.0',  :require => false
-  gem 'coveralls',                   :require => false
-  gem 'simplecov-console',           :require => false
-  gem 'webmock',                     :require => false
+  gem 'voxpupuli-test', '~> 2.0',  :require => false
+  gem 'coveralls',                 :require => false
+  gem 'simplecov-console',         :require => false
+  gem 'webmock',                   :require => false
 end
 
 group :development do

README.md

@@ -45,7 +45,7 @@ gitlab_ci_runner::runner_defaults:
   url: "https://git.example.com/ci"
   registration-token: "1234567890abcdef"
   executor: "docker"
-  docker-image: "ubuntu:trusty"
+  docker-image: "ubuntu:focal"
   builds_dir: "/tmp"
   cache_dir: "/tmp"
 ```

manifests/config.pp

@@ -15,7 +15,7 @@
   assert_private()
 
   file { $config_path: # ensure config exists
-    ensure  => 'present',
+    ensure  => 'file',
     replace => 'no',
     content => '',
   }

manifests/init.pp

@@ -61,16 +61,16 @@
   Stdlib::HTTPUrl            $repo_base_url            = 'https://packages.gitlab.com',
   Optional[Stdlib::Fqdn]     $repo_keyserver           = undef,
   String                     $config_path              = '/etc/gitlab-runner/config.toml',
-){
+) {
   if $manage_docker {
     # workaround for cirunner issue #1617
     # https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1617
     ensure_packages($xz_package_name)
 
     $docker_images = {
-      ubuntu_trusty => {
+      ubuntu_focal => {
         image     => 'ubuntu',
-        image_tag => 'trusty',
+        image_tag => 'focal',
       },
     }
 

manifests/runner.pp

@@ -52,13 +52,13 @@
 
   if $ensure == 'absent' {
     # Execute gitlab ci multirunner unregister
-    exec {"Unregister_runner_${title}":
+    exec { "Unregister_runner_${title}":
       command => "/usr/bin/${binary} unregister -n ${_name}",
       onlyif  => "/bin/grep -F \'${_name}\' /etc/gitlab-runner/config.toml",
     }
   } else {
     # Execute gitlab ci multirunner register
-    exec {"Register_runner_${title}":
+    exec { "Register_runner_${title}":
       command => "/usr/bin/${binary} register -n ${__config}",
       unless  => "/bin/grep -F \'${_name}\' /etc/gitlab-runner/config.toml",
     }

spec/classes/gitlab_ci_runner_spec.rb

@@ -184,9 +184,9 @@
             is_expected.to contain_class('docker::images').
               with(
                 images: {
-                  'ubuntu_trusty' => {
+                  'ubuntu_focal' => {
                     'image'     => 'ubuntu',
-                    'image_tag' => 'trusty'
+                    'image_tag' => 'focal'
                   }
                 }
               )
@@ -224,7 +224,7 @@
           end
         when 'RedHat'
           os_release_version = if facts[:os]['name'] == 'Amazon'
-                                 if facts[:os]['release']['major'] == 2
+                                 if facts[:os]['release']['major'] == '2'
                                    '7'
                                  else
                                    '6'