Skip to content

Commit d843b16

Browse files
andreas-stuerzandreas-stuerz
committed
Merge branch 'main_upstream' into containerd_private_registry_auth
2 parents 7d372ac + ebfb8fe commit d843b16

File tree

11 files changed

+187
-62
lines changed

11 files changed

+187
-62
lines changed

‎.fixtures.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ fixtures:
44
apt: 'puppetlabs-apt'
55
puppet_conf: 'puppetlabs-puppet_conf'
66
archive: "puppet-archive"
7-
translate: "puppetlabs-translate"
87
augeasproviders_sysctl: "herculesteam-augeasproviders_sysctl"
98
augeasproviders_core: "herculesteam-augeasproviders_core"
109
kmod: "camptocamp-kmod"

‎.github/workflows/auto_release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
persist-credentials: false
3737

3838
- name: "PDK Release prep"
39-
uses: docker://puppet/pdk:nightly
39+
uses: docker://puppet/iac_release:ci
4040
with:
4141
args: 'release prep --force'
4242
env:

‎.github/workflows/release.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: "Publish module"
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
create-github-release:
8+
name: Deploy GitHub Release
9+
runs-on: ubuntu-20.04
10+
steps:
11+
- name: Checkout code
12+
uses: actions/checkout@v2
13+
with:
14+
ref: ${{ github.ref }}
15+
clean: true
16+
fetch-depth: 0
17+
- name: Get Version
18+
id: gv
19+
run: |
20+
echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
21+
- name: Create Release
22+
uses: actions/create-release@v1
23+
id: create_release
24+
env:
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
with:
27+
tag_name: "v${{ steps.gv.outputs.ver }}"
28+
draft: false
29+
prerelease: false
30+
31+
deploy-forge:
32+
name: Deploy to Forge
33+
runs-on: ubuntu-20.04
34+
steps:
35+
- name: Checkout code
36+
uses: actions/checkout@v2
37+
with:
38+
ref: ${{ github.ref }}
39+
clean: true
40+
- name: "PDK Build"
41+
uses: docker://puppet/pdk:nightly
42+
with:
43+
args: 'build'
44+
- name: "Push to Forge"
45+
uses: docker://puppet/pdk:nightly
46+
with:
47+
args: 'release publish --forge-token ${{ secrets.FORGE_API_KEY }} --force'

‎.github/workflows/spec.yml‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
name: "Spec Tests"
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * *'
6+
workflow_dispatch:
7+
pull_request:
8+
9+
env:
10+
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
11+
HONEYCOMB_DATASET: litmus tests
12+
13+
jobs:
14+
setup_matrix:
15+
name: "Setup Test Matrix"
16+
runs-on: ubuntu-20.04
17+
outputs:
18+
spec_matrix: ${{ steps.get-matrix.outputs.spec_matrix }}
19+
20+
steps:
21+
- name: "Honeycomb: Start recording"
22+
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
23+
with:
24+
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
25+
dataset: ${{ env.HONEYCOMB_DATASET }}
26+
job-status: ${{ job.status }}
27+
28+
- name: "Honeycomb: Start first step"
29+
run: |
30+
echo STEP_ID=setup-environment >> $GITHUB_ENV
31+
echo STEP_START=$(date +%s) >> $GITHUB_ENV
32+
33+
- name: Checkout Source
34+
uses: actions/checkout@v2
35+
if: ${{ github.repository_owner == 'puppetlabs' }}
36+
37+
- name: Activate Ruby 2.7
38+
uses: ruby/setup-ruby@v1
39+
if: ${{ github.repository_owner == 'puppetlabs' }}
40+
with:
41+
ruby-version: "2.7"
42+
bundler-cache: true
43+
44+
- name: Print bundle environment
45+
if: ${{ github.repository_owner == 'puppetlabs' }}
46+
run: |
47+
echo ::group::bundler environment
48+
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
49+
echo ::endgroup::
50+
51+
- name: "Honeycomb: Record Setup Environment time"
52+
if: ${{ github.repository_owner == 'puppetlabs' }}
53+
run: |
54+
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
55+
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
56+
echo STEP_START=$(date +%s) >> $GITHUB_ENV
57+
58+
- name: Setup Spec Test Matrix
59+
id: get-matrix
60+
run: |
61+
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
62+
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
63+
else
64+
echo "::set-output name=spec_matrix::{}"
65+
fi
66+
67+
- name: "Honeycomb: Record Setup Test Matrix time"
68+
if: ${{ always() }}
69+
run: |
70+
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
71+
72+
Spec:
73+
name: "Spec Tests (Puppet: ${{matrix.puppet_version}}, Ruby Ver: ${{matrix.ruby_version}})"
74+
needs:
75+
- setup_matrix
76+
if: ${{ needs.setup_matrix.outputs.spec_matrix != '{}' }}
77+
78+
runs-on: ubuntu-20.04
79+
strategy:
80+
fail-fast: false
81+
matrix: ${{fromJson(needs.setup_matrix.outputs.spec_matrix)}}
82+
83+
env:
84+
BUILDEVENT_FILE: '../buildevents.txt'
85+
PUPPET_GEM_VERSION: ${{ matrix.puppet_version }}
86+
87+
steps:
88+
- run: |
89+
echo "SANITIZED_PUPPET_VERSION=$(echo '${{ matrix.puppet_version }}' | sed 's/~> //g')" >> $GITHUB_ENV
90+
91+
- run: |
92+
echo 'puppet_version=${{ env.SANITIZED_PUPPET_VERSION }}' >> $BUILDEVENT_FILE
93+
94+
- name: "Honeycomb: Start first step"
95+
run: |
96+
echo "STEP_ID=${{ env.SANITIZED_PUPPET_VERSION }}-spec" >> $GITHUB_ENV
97+
echo STEP_START=$(date +%s) >> $GITHUB_ENV
98+
99+
- name: "Honeycomb: Start recording"
100+
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
101+
with:
102+
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
103+
dataset: ${{ env.HONEYCOMB_DATASET }}
104+
job-status: ${{ job.status }}
105+
matrix-key: ${{ env.SANITIZED_PUPPET_VERSION }}
106+
107+
- name: Checkout Source
108+
uses: actions/checkout@v2
109+
110+
- name: "Activate Ruby ${{ matrix.ruby_version }}"
111+
uses: ruby/setup-ruby@v1
112+
with:
113+
ruby-version: ${{matrix.ruby_version}}
114+
bundler-cache: true
115+
116+
- name: Print bundle environment
117+
run: |
118+
echo ::group::bundler environment
119+
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
120+
echo ::endgroup::
121+
122+
- name: Run Static & Syntax Tests
123+
run: |
124+
buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks Puppet ${{ matrix.puppet_version }}, Ruby ${{ matrix.ruby_version }}' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
125+
126+
- name: Run parallel_spec tests
127+
run: |
128+
buildevents cmd $TRACE_ID $STEP_ID 'rake parallel_spec Puppet ${{ matrix.puppet_version }}, Ruby ${{ matrix.ruby_version }}' -- bundle exec rake parallel_spec

‎.pdkignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,4 @@
4242
/spec/
4343
/.vscode/
4444
/.sync.yml
45+
/.devcontainer/

‎.sync.yml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
.gitlab-ci.yml:
33
delete: true
44

5-
.travis.yml:
6-
global_env:
7-
- HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
8-
deploy_to_forge:
9-
enabled: false
10-
branches:
11-
- release
12-
simplecov: true
13-
145
appveyor.yml:
156
delete: true
167

@@ -65,3 +56,10 @@ spec/spec_helper.rb:
6556
unmanaged: true
6657
.github/workflows/auto_release.yml:
6758
unmanaged: false
59+
.github/workflows/spec.yml:
60+
checks: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
61+
unmanaged: false
62+
.github/workflows/release.yml:
63+
unmanaged: false
64+
.travis.yml:
65+
delete: true

‎.travis.yml‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎manifests/init.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@
676676

677677
if $controller {
678678
if $worker {
679-
fail(translate('A node can not be both a controller and a node'))
679+
fail('A node can not be both a controller and a node')
680680
}
681681
}
682682

‎manifests/service.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
}
6565

6666
default: {
67-
fail(translate('Please specify a valid container runtime'))
67+
fail('Please specify a valid container runtime')
6868
}
6969
}
7070

‎metadata.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
"name": "puppet-archive",
2121
"version_requirement": ">= 2.0.0 < 5.0.0"
2222
},
23-
{
24-
"name": "puppetlabs-translate",
25-
"version_requirement": ">= 1.0.0 < 3.0.0"
26-
},
2723
{
2824
"name": "herculesteam-augeasproviders_sysctl",
2925
"version_requirement": ">= 2.2.1 < 3.0.0"
@@ -59,5 +55,5 @@
5955
],
6056
"pdk-version": "1.18.1",
6157
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
62-
"template-ref": "heads/main-0-g6afe0a2"
58+
"template-ref": "heads/main-0-g7be43a3"
6359
}

0 commit comments

Comments
 (0)