Skip to content

Commit 8eef398

Browse files
committed
(PDKSync) Fix for sync.yml
1 parent 0904935 commit 8eef398

File tree

3 files changed

+22
-16
lines changed

3 files changed

+22
-16
lines changed

.github/workflows/nightly.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
matrix: ${{ steps.get-matrix.outputs.matrix }}
1919

2020
steps:
21-
21+
2222
- name: "Honeycomb: Start recording"
2323
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
2424
with:
@@ -47,23 +47,23 @@ 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: |
5454
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
5555
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
5656
echo STEP_START=$(date +%s) >> $GITHUB_ENV
57+
5758
- name: Setup Acceptance Test Matrix
5859
id: get-matrix
59-
if: ${{ github.repository_owner == 'puppetlabs' }}
6060
run: |
6161
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
62-
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2 --exclude-platforms '["Debian-9", "Debian-10", "Debian-11"]'
62+
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
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: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,16 @@ jobs:
6161
id: get-matrix
6262
run: |
6363
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
64-
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2 --exclude-platforms '["Debian-9", "Debian-10", "Debian-11"]'
64+
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
6565
else
6666
echo "::set-output name=matrix::{}"
6767
fi
68-
68+
6969
- name: "Honeycomb: Record Setup Test Matrix time"
7070
if: ${{ always() }}
7171
run: |
7272
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
73+
7374
Acceptance:
7475
name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
7576
needs:
@@ -123,6 +124,13 @@ jobs:
123124
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
124125
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
125126
echo STEP_START=$(date +%s) >> $GITHUB_ENV
127+
128+
- name: "Disable mysqld apparmor profile"
129+
if: matrix.platforms.provider == 'provision::docker'
130+
run: |
131+
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
132+
sudo apparmor_parser -R /etc/apparmor.d/disable/usr.sbin.mysqld
133+
126134
- name: Provision test environment
127135
run: |
128136
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 +156,7 @@ jobs:
148156
- name: Install module
149157
run: |
150158
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
151-
159+
152160
- name: "Honeycomb: Record deployment times"
153161
if: ${{ always() }}
154162
run: |

.sync.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,8 @@ Rakefile:
2121
unmanaged: false
2222
.github/workflows/nightly.yml:
2323
unmanaged: false
24-
exclude_platforms:
25-
- Debian-9
26-
- Debian-10
27-
- Debian-11
2824
.github/workflows/pr_test.yml:
2925
unmanaged: false
30-
exclude_platforms:
31-
- Debian-9
32-
- Debian-10
33-
- Debian-11
3426
.github/workflows/auto_release.yml:
3527
unmanaged: false
3628
.github/workflows/spec.yml:

0 commit comments

Comments
 (0)