From e578b4b35edf1614dd3c85c8fe03fd56de4879be Mon Sep 17 00:00:00 2001 From: Jason Antman Date: Tue, 19 Mar 2019 09:46:05 -0400 Subject: [PATCH 1/9] remove phonon-qt4 packages from kde class and bump to 0.4.0 --- CHANGELOG.md | 5 +++-- manifests/kde.pp | 3 --- metadata.json | 2 +- spec/acceptance/classes/kde_spec.rb | 3 --- spec/classes/kde_spec.rb | 3 --- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c60c36b..dfef5f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. [comment]: # IMPORTANT: Remember to update the links at the bottom of the file! -## [Unreleased] +## [0.4.0] Released 2019-03-19 +- ``kde`` class - stop managing ``phonon-qt4`` packages as they've been removed from the repos - Add ``.sync.yml`` for my [modulesync_configs](https://github.com/jantman/modulesync_configs) - Update ``.travis.yml``, ``Gemfile`` and some documentation via modulesync. - Fix ``metadata.json`` casing of supported operatingsystem name. @@ -70,7 +71,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - initial module creation - migration of a bunch of stuff from https://github.com/jantman/puppet-archlinux-macbookretina -[Unreleased]: https://github.com/jantman/puppet-archlinux-workstation/compare/0.3.2...master +[0.4.0]: https://github.com/jantman/puppet-archlinux-workstation/compare/0.3.2...0.4.0 [0.3.2]: https://github.com/jantman/puppet-archlinux-workstation/compare/0.3.1...0.3.2 [0.3.1]: https://github.com/jantman/puppet-archlinux-workstation/compare/0.3.0...0.3.1 [0.3.0]: https://github.com/jantman/puppet-archlinux-workstation/compare/0.2.1...0.3.0 diff --git a/manifests/kde.pp b/manifests/kde.pp index 059b508..cfd3ba9 100644 --- a/manifests/kde.pp +++ b/manifests/kde.pp @@ -14,9 +14,6 @@ # phonon/vlc audio; we install both backends $phonon_packages = [ - 'phonon-qt4', - 'phonon-qt4-gstreamer', - 'phonon-qt4-vlc', 'phonon-qt5', 'phonon-qt5-gstreamer', 'phonon-qt5-vlc', diff --git a/metadata.json b/metadata.json index 6ae8e58..a8ca6b9 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "jantman-archlinux_workstation", - "version": "0.3.2", + "version": "0.4.0", "summary": "Configure an Arch Linux workstation/desktop/laptop", "author": "jantman", "description": "Provides many classes (and a sane default class/init.pp) for configuring an Arch Linux workstation/laptop/desktop for graphical use.", diff --git a/spec/acceptance/classes/kde_spec.rb b/spec/acceptance/classes/kde_spec.rb index 2dabccd..5b471d7 100644 --- a/spec/acceptance/classes/kde_spec.rb +++ b/spec/acceptance/classes/kde_spec.rb @@ -24,9 +24,6 @@ class { 'archlinux_workstation::kde': } end $phonon_packages = [ - 'phonon-qt4', - 'phonon-qt4-gstreamer', - 'phonon-qt4-vlc', 'phonon-qt5', 'phonon-qt5-gstreamer', 'phonon-qt5-vlc', diff --git a/spec/classes/kde_spec.rb b/spec/classes/kde_spec.rb index f530f1e..550dc74 100644 --- a/spec/classes/kde_spec.rb +++ b/spec/classes/kde_spec.rb @@ -33,9 +33,6 @@ it { should contain_package('kde-applications-meta').with_ensure('present') } $phonon_packages = [ - 'phonon-qt4', - 'phonon-qt4-gstreamer', - 'phonon-qt4-vlc', 'phonon-qt5', 'phonon-qt5-gstreamer', 'phonon-qt5-vlc', From f0f4f26d3c6bd80c06196933f54bc45cbd707732 Mon Sep 17 00:00:00 2001 From: Jason Antman Date: Tue, 19 Mar 2019 10:03:55 -0400 Subject: [PATCH 2/9] pin some test dependencies in .fixtures.yml --- .fixtures.yml | 8 ++++++-- CHANGELOG.md | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index 48f0c49..d52bc64 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -6,8 +6,12 @@ fixtures: sudo: repo: "https://github.com/saz/puppet-sudo.git" ref: "v4.2.0" - ssh: "https://github.com/saz/puppet-ssh.git" - firewall: "https://github.com/puppetlabs/puppetlabs-firewall.git" + ssh: + repo: "https://github.com/saz/puppet-ssh.git" + ref: "v3.0.1" + firewall: + repo: "https://github.com/puppetlabs/puppetlabs-firewall.git" + ref: "1.8.0" inifile: "https://github.com/puppetlabs/puppetlabs-inifile.git" staging: "https://github.com/nanliu/puppet-staging.git" concat: diff --git a/CHANGELOG.md b/CHANGELOG.md index c60c36b..25059a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +- Pin some dependencies in ``.fixtures.yml`` to fix tests - Add ``.sync.yml`` for my [modulesync_configs](https://github.com/jantman/modulesync_configs) - Update ``.travis.yml``, ``Gemfile`` and some documentation via modulesync. - Fix ``metadata.json`` casing of supported operatingsystem name. From 6b33813c27334c62fc54780b0a82311c00dfb1fc Mon Sep 17 00:00:00 2001 From: Jason Antman Date: Tue, 19 Mar 2019 10:08:18 -0400 Subject: [PATCH 3/9] switch acceptance tests to working Docker image --- CHANGELOG.md | 1 + spec/acceptance/nodesets/default.yml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25059a7..65ce349 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] - Pin some dependencies in ``.fixtures.yml`` to fix tests +- Switch acceptance tests from deprecated ``archimg/base-devel:latest`` Docker image to ``archlinux/base:latest`` - Add ``.sync.yml`` for my [modulesync_configs](https://github.com/jantman/modulesync_configs) - Update ``.travis.yml``, ``Gemfile`` and some documentation via modulesync. - Fix ``metadata.json`` casing of supported operatingsystem name. diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml index 8560456..dcff7a7 100644 --- a/spec/acceptance/nodesets/default.yml +++ b/spec/acceptance/nodesets/default.yml @@ -2,9 +2,9 @@ HOSTS: archlinux-current-x64: platform: archlinux-current-amd64 hypervisor: docker - image: archimg/base-devel:latest + image: archlinux/base:latest docker_preserve_image: true - docker_cmd: '["/sbin/init"]' + docker_cmd: '["/usr/lib/systemd/systemd"]' docker_cap_add: ['SYS_ADMIN'] mount_folders: cgroup: @@ -13,5 +13,6 @@ HOSTS: opts: ro docker_image_commands: - 'echo "en_US.UTF-8 UTF-8" > /etc/locale.gen' + - 'pacman -S --noconfirm grep tar' CONFIG: trace_limit: 200 From baa5109e8f322a334e6dd0a8f04bf8beebba410b Mon Sep 17 00:00:00 2001 From: Jason Antman Date: Tue, 19 Mar 2019 10:14:23 -0400 Subject: [PATCH 4/9] pin puppet-module-posix-dev-r2.1 version under ruby 2.1 --- CHANGELOG.md | 1 + Gemfile | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65ce349..b4b11a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Pin some dependencies in ``.fixtures.yml`` to fix tests - Switch acceptance tests from deprecated ``archimg/base-devel:latest`` Docker image to ``archlinux/base:latest`` +- Fix Puppet4 unit tests by pinning ``puppet-module-posix-dev-r2.1`` version to 0.3.2 - Add ``.sync.yml`` for my [modulesync_configs](https://github.com/jantman/modulesync_configs) - Update ``.travis.yml``, ``Gemfile`` and some documentation via modulesync. - Fix ``metadata.json`` casing of supported operatingsystem name. diff --git a/Gemfile b/Gemfile index 6d0f8eb..20234b0 100644 --- a/Gemfile +++ b/Gemfile @@ -44,7 +44,11 @@ minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}" group :development do gem "puppet-module-posix-default-r#{minor_version}", :require => false, :platforms => "ruby" gem "puppet-module-win-default-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"] - gem "puppet-module-posix-dev-r#{minor_version}", :require => false, :platforms => "ruby" + if minor_version == '2.1' + gem "puppet-module-posix-dev-r2.1", '0.3.2', :require => false, :platforms => "ruby" + else + gem "puppet-module-posix-dev-r#{minor_version}", :require => false, :platforms => "ruby" + end gem "puppet-module-win-dev-r#{minor_version}", '0.0.7', :require => false, :platforms => ["mswin", "mingw", "x64_mingw"] gem "json_pure", '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') gem "fast_gettext", '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0') @@ -56,11 +60,11 @@ group :system_tests do gem "beaker-docker", '>= 0.3.0', :require => false 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", *location_for(ENV['BEAKER_VERSION'] || '>= 3') + gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3') gem "beaker-pe", :require => false - gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION']) + gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION']) gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION']) - gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1') + gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1') gem "puppet-blacksmith", '>= 4.1.1', :require => false gem "vandamme", :require => false gem "octokit", '~> 4.0', :require => false From d741bffb603c00d8b2513ae681dd1c762bd25e39 Mon Sep 17 00:00:00 2001 From: Jason Antman Date: Tue, 19 Mar 2019 10:23:35 -0400 Subject: [PATCH 5/9] fixtures.yml - unpin puppetlabs-concat version --- .fixtures.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.fixtures.yml b/.fixtures.yml index d52bc64..55a8cd6 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -16,7 +16,6 @@ fixtures: staging: "https://github.com/nanliu/puppet-staging.git" concat: repo: "https://github.com/puppetlabs/puppetlabs-concat.git" - ref: "2.2.1" docker: "https://github.com/garethr/garethr-docker.git" apt: repo: "https://github.com/puppetlabs/puppetlabs-apt.git" From b3e11686edcbe131893d477c757e9440cbe66348 Mon Sep 17 00:00:00 2001 From: Jason Antman Date: Tue, 19 Mar 2019 10:29:31 -0400 Subject: [PATCH 6/9] relax puppetlabs-concat version dependency --- CHANGELOG.md | 1 + metadata.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4b11a4..dc7a6fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Pin some dependencies in ``.fixtures.yml`` to fix tests - Switch acceptance tests from deprecated ``archimg/base-devel:latest`` Docker image to ``archlinux/base:latest`` - Fix Puppet4 unit tests by pinning ``puppet-module-posix-dev-r2.1`` version to 0.3.2 +- Relax puppetlabs-concat module version dependency - Add ``.sync.yml`` for my [modulesync_configs](https://github.com/jantman/modulesync_configs) - Update ``.travis.yml``, ``Gemfile`` and some documentation via modulesync. - Fix ``metadata.json`` casing of supported operatingsystem name. diff --git a/metadata.json b/metadata.json index 6ae8e58..b52b0cc 100644 --- a/metadata.json +++ b/metadata.json @@ -19,7 +19,7 @@ }, { "name": "puppetlabs/concat", - "version_requirement": ">= 1.2.5 <3.0.0" + "version_requirement": ">= 1.2.5" }, { "name": "puppetlabs/inifile", From 180be555a80a363504b051ed2f95a65ebdc109f1 Mon Sep 17 00:00:00 2001 From: Jason Antman Date: Tue, 19 Mar 2019 10:44:35 -0400 Subject: [PATCH 7/9] re-pin puppetlabs-concat fixture version --- .fixtures.yml | 1 + CHANGELOG.md | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.fixtures.yml b/.fixtures.yml index 55a8cd6..d52bc64 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -16,6 +16,7 @@ fixtures: staging: "https://github.com/nanliu/puppet-staging.git" concat: repo: "https://github.com/puppetlabs/puppetlabs-concat.git" + ref: "2.2.1" docker: "https://github.com/garethr/garethr-docker.git" apt: repo: "https://github.com/puppetlabs/puppetlabs-apt.git" diff --git a/CHANGELOG.md b/CHANGELOG.md index dc7a6fe..b4b11a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Pin some dependencies in ``.fixtures.yml`` to fix tests - Switch acceptance tests from deprecated ``archimg/base-devel:latest`` Docker image to ``archlinux/base:latest`` - Fix Puppet4 unit tests by pinning ``puppet-module-posix-dev-r2.1`` version to 0.3.2 -- Relax puppetlabs-concat module version dependency - Add ``.sync.yml`` for my [modulesync_configs](https://github.com/jantman/modulesync_configs) - Update ``.travis.yml``, ``Gemfile`` and some documentation via modulesync. - Fix ``metadata.json`` casing of supported operatingsystem name. From 657da3ee0a59bf0793e16b76c7c4018dcd3742ef Mon Sep 17 00:00:00 2001 From: Jason Antman Date: Tue, 19 Mar 2019 11:08:28 -0400 Subject: [PATCH 8/9] acceptance test node needs 'which' installed --- spec/acceptance/nodesets/default.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml index dcff7a7..c5cdf77 100644 --- a/spec/acceptance/nodesets/default.yml +++ b/spec/acceptance/nodesets/default.yml @@ -13,6 +13,6 @@ HOSTS: opts: ro docker_image_commands: - 'echo "en_US.UTF-8 UTF-8" > /etc/locale.gen' - - 'pacman -S --noconfirm grep tar' + - 'pacman -S --noconfirm grep tar which' CONFIG: trace_limit: 200 From 197181fa5b1461dc2461a4d56776ff180dd1dd4d Mon Sep 17 00:00:00 2001 From: Jason Antman Date: Tue, 19 Mar 2019 11:29:20 -0400 Subject: [PATCH 9/9] acceptance container needs awk --- spec/acceptance/nodesets/default.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml index c5cdf77..ff124bd 100644 --- a/spec/acceptance/nodesets/default.yml +++ b/spec/acceptance/nodesets/default.yml @@ -13,6 +13,6 @@ HOSTS: opts: ro docker_image_commands: - 'echo "en_US.UTF-8 UTF-8" > /etc/locale.gen' - - 'pacman -S --noconfirm grep tar which' + - 'pacman -S --noconfirm grep tar which awk' CONFIG: trace_limit: 200