Skip to content

Commit 2ec176e

Browse files
committed
Update with pdk update --template-ref 3.0.0
Needed some minor adjustment to `.sync.yml`.
1 parent adfe470 commit 2ec176e

File tree

11 files changed

+262
-279
lines changed

11 files changed

+262
-279
lines changed

.github/workflows/nightly.yml

Lines changed: 8 additions & 196 deletions
Original file line numberDiff line numberDiff line change
@@ -2,203 +2,15 @@ name: "nightly"
22

33
on:
44
schedule:
5-
- cron: '0 0 * * *'
6-
7-
8-
env:
9-
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
10-
HONEYCOMB_DATASET: litmus tests
5+
- cron: "0 0 * * *"
6+
workflow_dispatch:
117

128
jobs:
13-
setup_matrix:
14-
if: ${{ github.repository_owner == 'puppetlabs' }}
15-
name: "Setup Test Matrix"
16-
runs-on: ubuntu-20.04
17-
outputs:
18-
matrix: ${{ steps.get-matrix.outputs.matrix }}
19-
20-
steps:
21-
22-
- name: "Honeycomb: Start recording"
23-
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
24-
with:
25-
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
26-
dataset: ${{ env.HONEYCOMB_DATASET }}
27-
job-status: ${{ job.status }}
9+
Spec:
10+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
11+
secrets: "inherit"
2812

29-
- name: "Honeycomb: Start first step"
30-
run: |
31-
echo STEP_ID=setup-environment >> $GITHUB_ENV
32-
echo STEP_START=$(date +%s) >> $GITHUB_ENV
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-
- name: Setup Acceptance Test Matrix
58-
id: get-matrix
59-
if: ${{ github.repository_owner == 'puppetlabs' }}
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=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'
7113
Acceptance:
72-
name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
73-
needs:
74-
- setup_matrix
75-
76-
runs-on: ubuntu-20.04
77-
strategy:
78-
fail-fast: false
79-
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
80-
81-
env:
82-
BUILDEVENT_FILE: '../buildevents.txt'
83-
84-
steps:
85-
- run: |
86-
echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
87-
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
88-
echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
89-
90-
91-
- name: "Honeycomb: Start recording"
92-
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
93-
with:
94-
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
95-
dataset: ${{ env.HONEYCOMB_DATASET }}
96-
job-status: ${{ job.status }}
97-
matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }}
98-
99-
- name: "Honeycomb: start first step"
100-
run: |
101-
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
102-
echo STEP_START=$(date +%s) >> $GITHUB_ENV
103-
104-
- name: Checkout Source
105-
uses: actions/checkout@v2
106-
107-
- name: Activate Ruby 2.7
108-
uses: ruby/setup-ruby@v1
109-
with:
110-
ruby-version: "2.7"
111-
bundler-cache: true
112-
113-
- name: Print bundle environment
114-
run: |
115-
echo ::group::bundler environment
116-
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
117-
echo ::endgroup::
118-
119-
- name: "Honeycomb: Record Setup Environment time"
120-
if: ${{ always() }}
121-
run: |
122-
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
123-
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
124-
echo STEP_START=$(date +%s) >> $GITHUB_ENV
125-
126-
- name: Provision test environment
127-
run: |
128-
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
129-
echo ::group::=== REQUEST ===
130-
cat request.json || true
131-
echo
132-
echo ::endgroup::
133-
echo ::group::=== INVENTORY ===
134-
if [ -f 'spec/fixtures/litmus_inventory.yaml' ];
135-
then
136-
FILE='spec/fixtures/litmus_inventory.yaml'
137-
elif [ -f 'inventory.yaml' ];
138-
then
139-
FILE='inventory.yaml'
140-
fi
141-
sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
142-
echo ::endgroup::
143-
144-
- name: Install agent
145-
run: |
146-
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
147-
148-
- name: Install module
149-
run: |
150-
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
151-
152-
- name: "Honeycomb: Record deployment times"
153-
if: ${{ always() }}
154-
run: |
155-
echo ::group::honeycomb step
156-
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
157-
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
158-
echo STEP_START=$(date +%s) >> $GITHUB_ENV
159-
echo ::endgroup::
160-
161-
- name: Run acceptance tests
162-
run: |
163-
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
164-
165-
- name: "Honeycomb: Record acceptance testing times"
166-
if: ${{ always() }}
167-
run: |
168-
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
169-
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
170-
echo STEP_START=$(date +%s) >> $GITHUB_ENV
171-
172-
- name: Remove test environment
173-
if: ${{ always() }}
174-
continue-on-error: true
175-
run: |
176-
if [[ -f inventory.yaml || -f spec/fixtures/litmus_inventory.yaml ]]; then
177-
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
178-
echo ::group::=== REQUEST ===
179-
cat request.json || true
180-
echo
181-
echo ::endgroup::
182-
fi
183-
184-
- name: "Honeycomb: Record removal times"
185-
if: ${{ always() }}
186-
run: |
187-
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'
188-
189-
slack-workflow-status:
190-
if: ${{ github.repository_owner == 'puppetlabs' }}
191-
name: Post Workflow Status To Slack
192-
needs:
193-
- Acceptance
194-
runs-on: ubuntu-20.04
195-
steps:
196-
- name: Slack Workflow Notification
197-
uses: puppetlabs/Gamesight-slack-workflow-status@pdk-templates-v1
198-
with:
199-
# Required Input
200-
repo_token: ${{ secrets.GITHUB_TOKEN }}
201-
slack_webhook_url: ${{ secrets.SLACK_WEBHOOK }}
202-
# Optional Input
203-
channel: '#team-ia-bots'
204-
name: 'GABot'
14+
needs: Spec
15+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
16+
secrets: "inherit"

.github/workflows/release.yml

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,6 @@ on:
44
workflow_dispatch:
55

66
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'
7+
release:
8+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main"
9+
secrets: "inherit"

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
19+
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
2222
/convert_report.txt

.pdkignore

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
19+
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
2222
/convert_report.txt
@@ -26,20 +26,16 @@
2626
.envrc
2727
/inventory.yaml
2828
/spec/fixtures/litmus_inventory.yaml
29-
/appveyor.yml
30-
/.editorconfig
3129
/.fixtures.yml
3230
/Gemfile
3331
/.gitattributes
3432
/.gitignore
35-
/.gitlab-ci.yml
3633
/.pdkignore
3734
/.puppet-lint.rc
3835
/Rakefile
3936
/rakelib/
4037
/.rspec
41-
/.rubocop.yml
42-
/.travis.yml
38+
/..yml
4339
/.yardopts
4440
/spec/
4541
/.vscode/

0 commit comments

Comments
 (0)