Skip to content

Commit b1d5f0c

Browse files
committed
(CONT-494) Fix for workflows
1 parent 77faa8b commit b1d5f0c

File tree

2 files changed

+24
-9
lines changed

2 files changed

+24
-9
lines changed

.github/workflows/nightly.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ 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: |
@@ -63,7 +63,7 @@ jobs:
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,6 +123,12 @@ 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+
126132
- name: Provision test environment
127133
run: |
128134
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: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,14 @@ jobs:
4545
echo ::group::bundler environment
4646
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
4747
echo ::endgroup::
48-
48+
4949
- name: "Honeycomb: Record Setup Environment time"
5050
if: ${{ github.repository_owner == 'puppetlabs' }}
5151
run: |
5252
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
5353
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
5454
echo STEP_START=$(date +%s) >> $GITHUB_ENV
55+
5556
- name: Run validation steps
5657
run: |
5758
bundle exec rake validate
@@ -65,11 +66,12 @@ jobs:
6566
else
6667
echo "::set-output name=matrix::{}"
6768
fi
68-
69+
6970
- name: "Honeycomb: Record Setup Test Matrix time"
7071
if: ${{ always() }}
7172
run: |
7273
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
74+
7375
Acceptance:
7476
name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
7577
needs:
@@ -89,7 +91,7 @@ jobs:
8991
echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
9092
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
9193
echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
92-
94+
9395
- name: "Honeycomb: Start recording"
9496
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
9597
with:
@@ -116,13 +118,20 @@ jobs:
116118
echo ::group::bundler environment
117119
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
118120
echo ::endgroup::
119-
121+
120122
- name: "Honeycomb: Record Setup Environment time"
121123
if: ${{ always() }}
122124
run: |
123125
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
124126
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
125127
echo STEP_START=$(date +%s) >> $GITHUB_ENV
128+
129+
- name: "Disable mysqld apparmor profile"
130+
if: matrix.platforms.provider == 'provision::docker'
131+
run: |
132+
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
133+
sudo apparmor_parser -R /etc/apparmor.d/disable/usr.sbin.mysqld
134+
126135
- name: Provision test environment
127136
run: |
128137
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
@@ -148,7 +157,7 @@ jobs:
148157
- name: Install module
149158
run: |
150159
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
151-
160+
152161
- name: "Honeycomb: Record deployment times"
153162
if: ${{ always() }}
154163
run: |
@@ -160,7 +169,7 @@ jobs:
160169
- name: Run acceptance tests
161170
run: |
162171
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
163-
172+
164173
- name: "Honeycomb: Record acceptance testing times"
165174
if: ${{ always() }}
166175
run: |
@@ -178,7 +187,7 @@ jobs:
178187
echo
179188
echo ::endgroup::
180189
fi
181-
190+
182191
- name: "Honeycomb: Record removal times"
183192
if: ${{ always() }}
184193
run: |

0 commit comments

Comments
 (0)