Skip to content

Commit f569a8e

Browse files
mstyushinmstyushin
committedApr 3, 2024··
Merge branch 'dev'
2 parents 50c0b5d + 7f87b0a commit f569a8e

File tree

3 files changed

+40
-11
lines changed

3 files changed

+40
-11
lines changed
 

‎.github/workflows/mamonsu-tests-dev.yml

+18-5
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,30 @@ jobs:
2626
MAMONSU_PATH: '/home/runner/work/mamonsu/mamonsu/'
2727
strategy:
2828
matrix:
29-
docker_os: ['centos:7']
30-
zabbix_version: ['6.2.6']
31-
pg_version: ['12', '13', '14', '15', '16']
29+
docker_os: ['centos:7', 'centos:8']
30+
zabbix_version: ['6.2.9']
31+
pg_version: ['12', '13', '14', '15']
32+
include:
33+
- docker_os: 'centos:8'
34+
pg_version: '16'
35+
zabbix_version: '6.2.9'
36+
exclude:
37+
- docker_os: 'centos:8'
38+
pg_version: '12'
39+
- docker_os: 'centos:8'
40+
pg_version: '13'
41+
- docker_os: 'centos:8'
42+
pg_version: '14'
43+
- docker_os: 'centos:8'
44+
pg_version: '15'
3245

3346
steps:
3447
- name: Checkout mamonsu repo
3548
uses: actions/checkout@v1
3649

3750
- name: Install docker-compose
3851
run: sudo apt-get update
39-
- run: sudo rm /usr/local/bin/docker-compose
52+
- run: sudo rm -f /usr/local/bin/docker-compose
4053
- run: curl -L https://github.com/docker/compose/releases/download/${{ env.DOCKER_COMPOSE_VERSION }}/docker-compose-`uname -s`-`uname -m` > docker-compose
4154
- run: chmod +x docker-compose
4255
- run: sudo mv docker-compose /usr/local/bin
@@ -91,4 +104,4 @@ jobs:
91104
run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/metrics.sh --pg-version="${{ matrix.pg_version }}" --os="${{ matrix.docker_os }}"
92105

93106
- name: Test Mamonsu removal
94-
run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/mamonsu_removal.sh --os="${{ matrix.docker_os }}"
107+
run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/mamonsu_removal.sh --os="${{ matrix.docker_os }}"

‎.github/workflows/mamonsu-tests-master.yml

+17-5
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,35 @@ jobs:
2626
MAMONSU_PATH: '/home/runner/work/mamonsu/mamonsu/'
2727
strategy:
2828
matrix:
29-
docker_os: ['ubuntu:20.04', 'centos:7']
30-
zabbix_version: ['4.0.44', '4.4.10', '5.0.30', '5.4.12', '6.0.12', '6.2.6']
31-
pg_version: ['12', '13', '14', '15', '16']
29+
docker_os: ['ubuntu:20.04', 'centos:7', 'centos:8']
30+
zabbix_version: ['4.0.44', '4.4.10', '5.0.30', '5.4.12', '6.0.12', '6.2.9']
31+
pg_version: ['12', '13', '14', '15']
32+
include:
33+
- docker_os: 'centos:8'
34+
pg_version: '16'
35+
zabbix_version: '6.2.9'
3236
exclude:
3337
# excludes PG 15, 16 on CentOS
3438
- docker_os: 'centos:7'
3539
pg_version: '15'
3640
- docker_os: 'centos:7'
3741
pg_version: '16'
42+
- docker_os: 'centos:8'
43+
pg_version: '12'
44+
- docker_os: 'centos:8'
45+
pg_version: '13'
46+
- docker_os: 'centos:8'
47+
pg_version: '14'
48+
- docker_os: 'centos:8'
49+
pg_version: '15'
3850

3951
steps:
4052
- name: Checkout mamonsu repo
4153
uses: actions/checkout@v1
4254

4355
- name: Install docker-compose
4456
run: sudo apt-get update
45-
- run: sudo rm /usr/local/bin/docker-compose
57+
- run: sudo rm -f /usr/local/bin/docker-compose
4658
- run: curl -L https://github.com/docker/compose/releases/download/${{ env.DOCKER_COMPOSE_VERSION }}/docker-compose-`uname -s`-`uname -m` > docker-compose
4759
- run: chmod +x docker-compose
4860
- run: sudo mv docker-compose /usr/local/bin
@@ -97,4 +109,4 @@ jobs:
97109
run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/metrics.sh --pg-version="${{ matrix.pg_version }}" --os="${{ matrix.docker_os }}"
98110

99111
- name: Test Mamonsu removal
100-
run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/mamonsu_removal.sh --os="${{ matrix.docker_os }}"
112+
run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/mamonsu_removal.sh --os="${{ matrix.docker_os }}"

‎github-actions-tests/tests.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,24 @@ if [ "${OS}" = "centos:7" ]; then
4343
eval "${PACKAGE_MANAGER_INSTALL} wget"
4444
eval "${PACKAGE_MANAGER_INSTALL} bc"
4545
eval "${PACKAGE_MANAGER_INSTALL} unzip"
46-
REPO=${PACKAGE_MANAGER_INSTALL}" https://download.postgresql.org/pub/repos/yum/reporpms/EL-"$(echo ${OS} | sed -r 's/^[^0-9]*([0-9]+).*/\1/')"-x86_64/pgdg-redhat-repo-latest.noarch.rpm"
46+
eval "${PACKAGE_MANAGER_INSTALL} https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
47+
REPO=${PACKAGE_MANAGER_INSTALL}" https://download.postgresql.org/pub/repos/yum/reporpms/EL-"$(echo ${OS} | sed -r 's/^[^0-9]*([0-9]+).*/\1/')"-x86_64/pgdg-redhat-repo-latest.noarch.rpm"\
4748

4849
# run tests
4950
sudo bash /mamonsu/github-actions-tests/pg_install.sh --os="${OS}" --pmi="${PACKAGE_MANAGER_INSTALL}" --repo="${REPO}" --pg-version="${PG_VERSION}"
5051

5152
elif [ "${OS}" = "centos:8" ]; then
5253
# install and set up components missing in docker image (sudo, wget, bc, unzip)
54+
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
55+
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
5356
dnf update -y
5457
dnf install -y sudo
5558
PACKAGE_MANAGER_INSTALL="sudo dnf -y install"
5659
PACKAGE_MANAGER_REMOVE="sudo dnf -y remove"
5760
eval "${PACKAGE_MANAGER_INSTALL} wget"
5861
eval "${PACKAGE_MANAGER_INSTALL} bc"
5962
eval "${PACKAGE_MANAGER_INSTALL} unzip"
63+
eval "${PACKAGE_MANAGER_INSTALL} https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm"
6064
REPO=${PACKAGE_MANAGER_INSTALL}" https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm; sudo dnf -qy module disable postgresql"
6165

6266
# run tests

0 commit comments

Comments
 (0)
Please sign in to comment.