Skip to content

Commit 0904935

Browse files
david22swandavid22swan
committed
(PDKSync) Removal of puppet_module_gems
1 parent 83fb27d commit 0904935

File tree

5 files changed

+35
-40
lines changed

5 files changed

+35
-40
lines changed

‎.devcontainer/README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,18 @@ https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/pupp
1313

1414
// Set *default* container specific settings.json values on container create.
1515
"settings": {
16-
"terminal.integrated.shell.linux": "/bin/bash"
16+
"terminal.integrated.profiles.linux": {
17+
"bash": {
18+
"path": "bash",
19+
}
20+
}
1721
},
1822

1923
// Add the IDs of extensions you want installed when the container is created.
2024
"extensions": [
2125
"puppet.puppet-vscode",
2226
"rebornix.Ruby"
23-
]
27+
],
2428

2529
// Use 'forwardPorts' to make a list of ports inside the container available locally.
2630
"forwardPorts": [],

‎.github/workflows/nightly.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
matrix: ${{ steps.get-matrix.outputs.matrix }}
1919

2020
steps:
21-
21+
2222
- name: "Honeycomb: Start recording"
2323
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
2424
with:
@@ -47,23 +47,23 @@ jobs:
4747
echo ::group::bundler environment
4848
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
4949
echo ::endgroup::
50-
50+
5151
- name: "Honeycomb: Record Setup Environment time"
5252
if: ${{ github.repository_owner == 'puppetlabs' }}
5353
run: |
5454
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
5555
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
5656
echo STEP_START=$(date +%s) >> $GITHUB_ENV
57-
5857
- name: Setup Acceptance Test Matrix
5958
id: get-matrix
59+
if: ${{ github.repository_owner == 'puppetlabs' }}
6060
run: |
6161
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
62-
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
62+
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2 --exclude-platforms '["Debian-9", "Debian-10", "Debian-11"]'
6363
else
6464
echo "::set-output name=matrix::{}"
6565
fi
66-
66+
6767
- name: "Honeycomb: Record Setup Test Matrix time"
6868
if: ${{ always() }}
6969
run: |
@@ -123,12 +123,6 @@ jobs:
123123
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
124124
echo STEP_START=$(date +%s) >> $GITHUB_ENV
125125
126-
- name: "Disable mysqld apparmor profile"
127-
if: matrix.platforms.provider == 'provision::docker'
128-
run: |
129-
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
130-
sudo apparmor_parser -R /etc/apparmor.d/disable/usr.sbin.mysqld
131-
132126
- name: Provision test environment
133127
run: |
134128
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'

‎.github/workflows/pr_test.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,15 @@ jobs:
6161
id: get-matrix
6262
run: |
6363
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
64-
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
64+
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2 --exclude-platforms '["Debian-9", "Debian-10", "Debian-11"]'
6565
else
6666
echo "::set-output name=matrix::{}"
6767
fi
68-
68+
6969
- name: "Honeycomb: Record Setup Test Matrix time"
7070
if: ${{ always() }}
7171
run: |
7272
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
73-
7473
Acceptance:
7574
name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
7675
needs:
@@ -124,13 +123,6 @@ jobs:
124123
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
125124
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
126125
echo STEP_START=$(date +%s) >> $GITHUB_ENV
127-
128-
- name: "Disable mysqld apparmor profile"
129-
if: matrix.platforms.provider == 'provision::docker'
130-
run: |
131-
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
132-
sudo apparmor_parser -R /etc/apparmor.d/disable/usr.sbin.mysqld
133-
134126
- name: Provision test environment
135127
run: |
136128
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
@@ -156,7 +148,7 @@ jobs:
156148
- name: Install module
157149
run: |
158150
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
159-
151+
160152
- name: "Honeycomb: Record deployment times"
161153
if: ${{ always() }}
162154
run: |

‎Gemfile

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,28 @@ def location_for(place_or_version, fake_version = nil)
1313
end
1414
end
1515

16-
ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
17-
minor_version = ruby_version_segments[0..1].join('.')
18-
1916
group :development do
20-
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
21-
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
22-
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
23-
gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
24-
gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
25-
gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
26-
gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27-
gem "voxpupuli-puppet-lint-plugins", '>= 3.0', require: false, platforms: [:ruby]
28-
gem "github_changelog_generator", require: false
17+
gem "json", '~> 2.0', require: false
18+
gem "voxpupuli-puppet-lint-plugins", '~> 3.0', require: false
19+
gem "facterdb", '~> 1.18', require: false
20+
gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false
21+
gem "puppetlabs_spec_helper", '>= 3.0.0', '< 5.0.0', require: false
22+
gem "rspec-puppet-facts", '~> 2.0', require: false
23+
gem "codecov", '~> 0.2', require: false
24+
gem "dependency_checker", '~> 0.2', require: false
25+
gem "parallel_tests", '~> 3.4', require: false
26+
gem "pry", '~> 0.10', require: false
27+
gem "simplecov-console", '~> 0.5', require: false
28+
gem "puppet-debugger", '~> 1.0', require: false
29+
gem "rubocop", '= 1.6.1', require: false
30+
gem "rubocop-performance", '= 1.9.1', require: false
31+
gem "rubocop-rspec", '= 2.0.1', require: false
32+
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
33+
gem "github_changelog_generator", require: false
2934
end
3035
group :system_tests do
31-
gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
32-
gem "puppet-module-win-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
36+
gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby]
37+
gem "serverspec", '~> 2.41', require: false
3338
end
3439

3540
puppet_version = ENV['PUPPET_GEM_VERSION']

‎metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,6 @@
8787
],
8888
"description": "MySQL module",
8989
"template-url": "https://github.com/puppetlabs/pdk-templates#main",
90-
"template-ref": "heads/main-0-g806810b",
91-
"pdk-version": "2.4.0"
90+
"template-ref": "tags/2.6.0-0-gd0490b9",
91+
"pdk-version": "2.5.0"
9292
}

0 commit comments

Comments
 (0)