Skip to content

Commit 23fa7e3

Browse files
author
alexander popov
committed
tests: add test old zabbix versions
1 parent a4f2a27 commit 23fa7e3

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Makefile.tests

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ run_local_test_pg13: clean_local_test_pg13
101101
docker rm pg13
102102

103103
run_zabbix: clean_zabbix
104+
docker network create --driver=bridge --subnet=172.18.0.0/16 network-local-tests
104105
$(WORKDIR)/tests/local_start_zabbix.sh
105106

106107
clean_local_test_pg9.5:

tests/local_start_zabbix.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
if [ ! -v ZABBIX_DOCKER_VERSIONS ];
44
then
5-
export ZABBIX_DOCKER_VERSIONS="5.2 5.0 4.4 4.2"
5+
export ZABBIX_DOCKER_VERSIONS="5.2 5.0 4.4 4.2 4.0 3.4 3.2 3.0"
66
fi
77
# !!!! zabbix 4.4 имеет порт 80, остальные 8080
88
#ZABBIX_DOCKER_VERSIONS="4.4"

tests/local_tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
###### test mamonsu zabbix *
77
mkdir /etc/mamonsu/
88
cp /var/tmp/mamonsu/packaging/conf/example.conf /etc/mamonsu/agent.conf
9-
ZABBIX_DOCKER_VERSIONS="5.2 5.0 4.4 4.2"
9+
ZABBIX_DOCKER_VERSIONS="5.2 5.0 4.4 4.2 4.0 3.4 3.2 3.0"
1010
for VER in $ZABBIX_DOCKER_VERSIONS
1111
do
1212
IFS='.' read -ra VER_ARRAY <<<$VER
1313
VER_MAJOR=${VER_ARRAY[0]}
1414
VER_MINOR=${VER_ARRAY[1]}
1515

1616
Z_PORT=":8080"
17-
if [[ "$VER" == "4.2" ]]
17+
if [[ "$VER" == "4.2" || "$VER" == "3.4" || "$VER" == "3.2" ]]
1818
then
1919
Z_PORT=":80"
2020
fi

0 commit comments

Comments
 (0)