Skip to content

Commit e00e028

Browse files
committed
syncing from "puppetlabs/support_workflows"
1 parent ff8d009 commit e00e028

File tree

3 files changed

+7
-67
lines changed

3 files changed

+7
-67
lines changed

.github/workflows/auto_release.yml

-18
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44
workflow_dispatch:
55

66
env:
7-
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
8-
HONEYCOMB_DATASET: litmus tests
97
CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
108

119
jobs:
@@ -14,18 +12,6 @@ jobs:
1412
runs-on: ubuntu-20.04
1513

1614
steps:
17-
- name: "Honeycomb: Start recording"
18-
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
19-
with:
20-
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
21-
dataset: ${{ env.HONEYCOMB_DATASET }}
22-
job-status: ${{ job.status }}
23-
24-
- name: "Honeycomb: start first step"
25-
run: |
26-
echo STEP_ID="auto-release" >> $GITHUB_ENV
27-
echo STEP_START=$(date +%s) >> $GITHUB_ENV
28-
2915
- name: "Checkout Source"
3016
if: ${{ github.repository_owner == 'puppetlabs' }}
3117
uses: actions/checkout@v3
@@ -84,7 +70,3 @@ jobs:
8470
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
8571
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
8672
87-
- name: "Honeycomb: Record finish step"
88-
if: ${{ always() }}
89-
run: |
90-
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Finished auto release workflow'

.github/workflows/call_nightly.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Call main PR testing workflows
1+
name: Call nightly testing workflows
22

33
on:
44
workflow_dispatch:
@@ -11,7 +11,7 @@ jobs:
1111
uses: ./.github/workflows/spec.yml
1212

1313
nightly_testing:
14+
if: github.repository != 'puppetlabs/puppetlabs-bash_task_helper' && github.repository != 'puppetlabs/puppetlabs-puppet_operations_appliance'
1415
name: "PE Nightly Testing"
1516
needs: spec_testing
16-
if: github.repository != 'puppetlabs/puppetlabs-bash_task_helper' || github.repository != 'puppetlabs/puppetlabs-puppet_operations_appliance'
1717
uses: ./.github/workflows/pe_nightly_testing.yml

.github/workflows/spec.yml

+5-47
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ on:
55
workflow_call:
66

77
env:
8-
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
9-
HONEYCOMB_DATASET: litmus tests
108
SHELLCHECK_OPTS: '-e SC1090 -e SC1091'
119

1210
jobs:
@@ -17,17 +15,6 @@ jobs:
1715
spec_matrix: ${{ steps.get-matrix.outputs.spec_matrix }}
1816

1917
steps:
20-
- name: "Honeycomb: Start recording"
21-
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
22-
with:
23-
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
24-
dataset: ${{ env.HONEYCOMB_DATASET }}
25-
job-status: ${{ job.status }}
26-
27-
- name: "Honeycomb: Start first step"
28-
run: |
29-
echo STEP_ID=setup-environment >> $GITHUB_ENV
30-
echo STEP_START=$(date +%s) >> $GITHUB_ENV
3118

3219
- name: Checkout Source
3320
uses: actions/checkout@v3
@@ -44,30 +31,18 @@ jobs:
4431
if: ${{ github.repository_owner == 'puppetlabs' }}
4532
run: |
4633
echo ::group::bundler environment
47-
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
34+
bundle env
4835
echo ::endgroup::
4936
50-
- name: "Honeycomb: Record Setup Environment time"
51-
if: ${{ github.repository_owner == 'puppetlabs' }}
52-
run: |
53-
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
54-
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
55-
echo STEP_START=$(date +%s) >> $GITHUB_ENV
56-
5737
- name: Setup Spec Test Matrix
5838
id: get-matrix
5939
run: |
6040
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
61-
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
41+
bundle exec matrix_from_metadata_v2
6242
else
6343
echo "spec_matrix={}" >> $GITHUB_OUTPUT
6444
fi
6545
66-
- name: "Honeycomb: Record Setup Test Matrix time"
67-
if: ${{ always() }}
68-
run: |
69-
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
70-
7146
Spec:
7247
name: "Spec Tests (Puppet: ${{matrix.puppet_version}}, Ruby Ver: ${{matrix.ruby_version}})"
7348
needs:
@@ -80,29 +55,12 @@ jobs:
8055
matrix: ${{fromJson(needs.setup_matrix.outputs.spec_matrix)}}
8156

8257
env:
83-
BUILDEVENT_FILE: '../buildevents.txt'
8458
PUPPET_GEM_VERSION: ${{ matrix.puppet_version }}
8559

8660
steps:
8761
- run: |
8862
echo "SANITIZED_PUPPET_VERSION=$(echo '${{ matrix.puppet_version }}' | sed 's/~> //g')" >> $GITHUB_ENV
8963
90-
- run: |
91-
echo 'puppet_version=${{ env.SANITIZED_PUPPET_VERSION }}' >> $BUILDEVENT_FILE
92-
93-
- name: "Honeycomb: Start first step"
94-
run: |
95-
echo "STEP_ID=${{ env.SANITIZED_PUPPET_VERSION }}-spec" >> $GITHUB_ENV
96-
echo STEP_START=$(date +%s) >> $GITHUB_ENV
97-
98-
- name: "Honeycomb: Start recording"
99-
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
100-
with:
101-
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
102-
dataset: ${{ env.HONEYCOMB_DATASET }}
103-
job-status: ${{ job.status }}
104-
matrix-key: ${{ env.SANITIZED_PUPPET_VERSION }}
105-
10664
- name: Checkout Source
10765
uses: actions/checkout@v3
10866

@@ -115,16 +73,16 @@ jobs:
11573
- name: Print bundle environment
11674
run: |
11775
echo ::group::bundler environment
118-
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
76+
bundle env
11977
echo ::endgroup::
12078
12179
- name: Run Static & Syntax Tests
12280
run: |
123-
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
81+
bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
12482
12583
- name: Run parallel_spec tests
12684
run: |
127-
buildevents cmd $TRACE_ID $STEP_ID 'rake parallel_spec Puppet ${{ matrix.puppet_version }}, Ruby ${{ matrix.ruby_version }}' -- bundle exec rake parallel_spec
85+
bundle exec rake parallel_spec
12886
shellcheck:
12987
name: Shellcheck
13088
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)