Skip to content

Commit 20f6a93

Browse files
DavidSDavidS
authored
Merge pull request #972 from puppetlabs/pdksync_remove_puppet5
pdksync - Remove Puppet 5 from testing and bump minimal version to 6.0.0
2 parents aa2da4c + c6e32be commit 20f6a93

File tree

6 files changed

+91
-89
lines changed

6 files changed

+91
-89
lines changed

‎.github/workflows/auto_release.yml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
name: "Auto release"
2+
3+
on:
4+
schedule:
5+
- cron: '0 3 * * 6'
6+
workflow_dispatch:
7+
8+
env:
9+
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
10+
HONEYCOMB_DATASET: litmus tests
11+
CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
12+
13+
jobs:
14+
auto_release:
15+
name: "Automatic release prep"
16+
runs-on: ubuntu-20.04
17+
18+
steps:
19+
- name: "Honeycomb: Start recording"
20+
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
21+
with:
22+
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
23+
dataset: ${{ env.HONEYCOMB_DATASET }}
24+
job-status: ${{ job.status }}
25+
26+
- name: "Honeycomb: start first step"
27+
run: |
28+
echo STEP_ID="auto-release" >> $GITHUB_ENV
29+
echo STEP_START=$(date +%s) >> $GITHUB_ENV
30+
31+
- name: "Checkout Source"
32+
if: ${{ github.repository_owner == 'puppetlabs' }}
33+
uses: actions/checkout@v2
34+
with:
35+
fetch-depth: 0
36+
persist-credentials: false
37+
38+
- name: "PDK Release prep"
39+
uses: docker://puppet/pdk:nightly
40+
with:
41+
args: 'release prep --force'
42+
env:
43+
CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44+
45+
- name: "Get Version"
46+
if: ${{ github.repository_owner == 'puppetlabs' }}
47+
id: gv
48+
run: |
49+
echo "::set-output name=ver::$(cat metadata.json | jq .version | tr -d \")"
50+
51+
- name: "Commit changes"
52+
if: ${{ github.repository_owner == 'puppetlabs' }}
53+
run: |
54+
git config --local user.email "[email protected]"
55+
git config --local user.name "GitHub Action"
56+
git add .
57+
git commit -m "Release prep v${{ steps.gv.outputs.ver }}"
58+
59+
- name: Create Pull Request
60+
id: cpr
61+
uses: puppetlabs/peter-evans-create-pull-request@v3
62+
if: ${{ github.repository_owner == 'puppetlabs' }}
63+
with:
64+
token: ${{ secrets.GITHUB_TOKEN }}
65+
commit-message: "Release prep v${{ steps.gv.outputs.ver }}"
66+
branch: "release-prep"
67+
delete-branch: true
68+
title: "Release prep v${{ steps.gv.outputs.ver }}"
69+
body: "Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb)"
70+
labels: "maintenance"
71+
72+
- name: PR outputs
73+
if: ${{ github.repository_owner == 'puppetlabs' }}
74+
run: |
75+
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
76+
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
77+
78+
- name: "Honeycomb: Record finish step"
79+
if: ${{ always() }}
80+
run: |
81+
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Finished auto release workflow'

‎.rubocop.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ RSpec/BeforeAfterAll:
2929
RSpec/HookArgument:
3030
Description: Prefer explicit :each argument, matching existing module's style
3131
EnforcedStyle: each
32+
RSpec/DescribeSymbol:
33+
Exclude:
34+
- spec/unit/facter/**/*.rb
3235
Style/BlockDelimiters:
3336
Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
3437
be consistent then.
@@ -404,6 +407,8 @@ Style/ExponentialNotation:
404407
Enabled: false
405408
Style/FloatDivision:
406409
Enabled: false
410+
Style/FrozenStringLiteralComment:
411+
Enabled: false
407412
Style/GlobalStdStream:
408413
Enabled: false
409414
Style/HashAsLastArrayItem:

‎.sync.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,6 @@
2121
- puppet6
2222
provision_list:
2323
- travis_ub_6
24-
- collection:
25-
puppet_collection:
26-
- puppet5
27-
provision_list:
28-
- travis_ub_5
29-
- collection:
30-
puppet_collection:
31-
- puppet5
32-
provision_list:
33-
- travis_el8
34-
dist: xenial
3524
- collection:
3625
puppet_collection:
3726
- puppet6
@@ -59,3 +48,5 @@ spec/spec_helper.rb:
5948
unmanaged: false
6049
.github/workflows/pr_test.yml:
6150
unmanaged: false
51+
.github/workflows/auto_release.yml:
52+
unmanaged: false

‎.travis.yml‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -38,29 +38,6 @@ jobs:
3838
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
3939
services: docker
4040
stage: acceptance
41-
- before_script:
42-
- "bundle exec rake 'litmus:provision_list[travis_ub_5]'"
43-
- "bundle exec rake 'litmus:install_agent[puppet5]'"
44-
- "bundle exec rake litmus:install_module"
45-
env:
46-
PLATFORMS: travis_ub_5_puppet5
47-
BUNDLE_WITH: system_tests
48-
rvm: 2.5.7
49-
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
50-
services: docker
51-
stage: acceptance
52-
- before_script:
53-
- "bundle exec rake 'litmus:provision_list[travis_el8]'"
54-
- "bundle exec rake 'litmus:install_agent[puppet5]'"
55-
- "bundle exec rake litmus:install_module"
56-
dist: xenial
57-
env:
58-
PLATFORMS: travis_el8_puppet5
59-
BUNDLE_WITH: system_tests
60-
rvm: 2.5.7
61-
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
62-
services: docker
63-
stage: acceptance
6441
- before_script:
6542
- "bundle exec rake 'litmus:provision_list[travis_el8]'"
6643
- "bundle exec rake 'litmus:install_agent[puppet6]'"
@@ -73,28 +50,6 @@ jobs:
7350
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
7451
services: docker
7552
stage: acceptance
76-
- before_script:
77-
- "bundle exec rake 'litmus:provision_list[travis_deb]'"
78-
- "bundle exec rake 'litmus:install_agent[puppet5]'"
79-
- "bundle exec rake litmus:install_module"
80-
env:
81-
PLATFORMS: travis_deb_puppet5
82-
BUNDLE_WITH: system_tests
83-
rvm: 2.5.7
84-
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
85-
services: docker
86-
stage: acceptance
87-
- before_script:
88-
- "bundle exec rake 'litmus:provision_list[travis_el7]'"
89-
- "bundle exec rake 'litmus:install_agent[puppet5]'"
90-
- "bundle exec rake litmus:install_module"
91-
env:
92-
PLATFORMS: travis_el7_puppet5
93-
BUNDLE_WITH: system_tests
94-
rvm: 2.5.7
95-
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
96-
services: docker
97-
stage: acceptance
9853
- before_script:
9954
- "bundle exec rake 'litmus:provision_list[travis_deb]'"
10055
- "bundle exec rake 'litmus:install_agent[puppet6]'"
@@ -120,10 +75,6 @@ jobs:
12075
-
12176
env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
12277
stage: static
123-
-
124-
env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
125-
rvm: 2.4.5
126-
stage: spec
12778
-
12879
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
12980
rvm: 2.5.7

‎metadata.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@
7575
"requirements": [
7676
{
7777
"name": "puppet",
78-
"version_requirement": ">= 5.5.10 < 8.0.0"
78+
"version_requirement": ">= 6.0.0 < 8.0.0"
7979
}
8080
],
8181
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
82-
"template-ref": "heads/main-0-g1862b96",
83-
"pdk-version": "1.19.0.pre (47)"
82+
"template-ref": "heads/main-0-g44cc7ed",
83+
"pdk-version": "1.18.1"
8484
}

‎provision.yaml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ travis_deb:
1313
images:
1414
- litmusimage/debian:8
1515
- litmusimage/debian:9
16-
travis_ub_5:
17-
provisioner: docker
18-
images:
19-
- litmusimage/ubuntu:14.04
20-
- litmusimage/ubuntu:16.04
21-
- litmusimage/ubuntu:18.04
2216
travis_ub_6:
2317
provisioner: docker
2418
images:
@@ -34,26 +28,6 @@ travis_el8:
3428
provisioner: docker
3529
images:
3630
- litmusimage/centos:8
37-
release_checks_5:
38-
provisioner: abs
39-
images:
40-
- redhat-6-x86_64
41-
- redhat-7-x86_64
42-
- redhat-8-x86_64
43-
- centos-6-x86_64
44-
- centos-7-x86_64
45-
- centos-8-x86_64
46-
- oracle-6-x86_64
47-
- scientific-6-x86_64
48-
- scientific-7-x86_64
49-
- debian-8-x86_64
50-
- debian-9-x86_64
51-
- debian-10-x86_64
52-
- sles-12-x86_64
53-
- sles-15-x86_64
54-
- ubuntu-1404-x86_64
55-
- ubuntu-1604-x86_64
56-
- ubuntu-1804-x86_64
5731
release_checks_6:
5832
provisioner: abs
5933
images:

0 commit comments

Comments
 (0)