Skip to content

Commit d7e8fcb

Browse files
committed
(CONT-1203) - Fixing CI pipeline for Debian & Ubuntu-20
1 parent 3f8ece0 commit d7e8fcb

File tree

4 files changed

+13
-64
lines changed

4 files changed

+13
-64
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ on:
77
workflow_dispatch:
88

99
jobs:
10-
Spec:
11-
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
12-
with:
13-
runs_on: "ubuntu-20.04"
14-
secrets: "inherit"
10+
# Spec:
11+
# uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
12+
# with:
13+
# runs_on: "ubuntu-20.04"
14+
# secrets: "inherit"
1515

1616
setup_matrix:
1717
name: "Setup Test Matrix"
18-
needs: "Spec"
18+
# needs: "Spec"
1919
runs-on: ubuntu-20.04
2020
outputs:
2121
matrix: ${{ steps.get-matrix.outputs.matrix }}
@@ -71,10 +71,12 @@ jobs:
7171
bundle env
7272
7373
- name: "Disable mysqld apparmor profile"
74-
if: matrix.platforms.provider == 'provision::docker'
75-
run: |
74+
if: ${{matrix.platforms.provider == 'docker'}}
75+
run: |
7676
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
7777
sudo apparmor_parser -R /etc/apparmor.d/disable/usr.sbin.mysqld
78+
sudo systemctl disable apparmor
79+
sudo systemctl stop apparmor
7880
7981
- name: Provision test environment
8082
run: |
@@ -99,4 +101,3 @@ jobs:
99101
continue-on-error: true
100102
run: |
101103
bundle exec rake 'litmus:tear_down'
102-

.github/workflows/nightly.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ jobs:
7474
run: |
7575
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
7676
sudo apparmor_parser -R /etc/apparmor.d/disable/usr.sbin.mysqld
77+
sudo systemctl disable apparmor
78+
sudo systemctl stop apparmor
7779
7880
- name: Provision test environment
7981
run: |
@@ -98,4 +100,3 @@ jobs:
98100
continue-on-error: true
99101
run: |
100102
bundle exec rake 'litmus:tear_down'
101-

metadata.json

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -21,59 +21,6 @@
2121
"8",
2222
"9"
2323
]
24-
},
25-
{
26-
"operatingsystem": "CentOS",
27-
"operatingsystemrelease": [
28-
"7",
29-
"8"
30-
]
31-
},
32-
{
33-
"operatingsystem": "OracleLinux",
34-
"operatingsystemrelease": [
35-
"7"
36-
]
37-
},
38-
{
39-
"operatingsystem": "Debian",
40-
"operatingsystemrelease": [
41-
"10",
42-
"11"
43-
]
44-
},
45-
{
46-
"operatingsystem": "Scientific",
47-
"operatingsystemrelease": [
48-
"7"
49-
]
50-
},
51-
{
52-
"operatingsystem": "SLES",
53-
"operatingsystemrelease": [
54-
"12",
55-
"15"
56-
]
57-
},
58-
{
59-
"operatingsystem": "Ubuntu",
60-
"operatingsystemrelease": [
61-
"18.04",
62-
"20.04",
63-
"22.04"
64-
]
65-
},
66-
{
67-
"operatingsystem": "Rocky",
68-
"operatingsystemrelease": [
69-
"8"
70-
]
71-
},
72-
{
73-
"operatingsystem": "AlmaLinux",
74-
"operatingsystemrelease": [
75-
"8"
76-
]
7724
}
7825
],
7926
"requirements": [

spec/spec_helper_acceptance_local.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def mysql_version
1111
shell_output = LitmusHelper.instance.run_shell('mysql --version', expect_failures: true)
1212
if shell_output.stdout.match(%r{\d+\.\d+\.\d+}).nil?
1313
# mysql is not yet installed, so we apply this class to install it
14-
LitmusHelper.instance.apply_manifest('include mysql::server', debug: true, catch_failures: true)
14+
LitmusHelper.instance.apply_manifest('include mysql::server', catch_failures: true)
1515
shell_output = LitmusHelper.instance.run_shell('mysql --version')
1616
raise _('unable to get mysql version') if shell_output.stdout.match(%r{\d+\.\d+\.\d+}).nil?
1717
end

0 commit comments

Comments
 (0)