From c7cd1985ca2a03a67e641a7245a90a3cb7adfba5 Mon Sep 17 00:00:00 2001 From: Aleksandr Iantsen Date: Mon, 8 Apr 2024 06:47:43 +0300 Subject: [PATCH] made tiny changes to github workflows --- .github/workflows/additional_tests.yaml | 4 ++-- .github/workflows/compatibility_50.yaml | 12 ++++++------ .github/workflows/compatibility_60.yaml | 12 ++++++------ .github/workflows/compatibility_64.yaml | 12 ++++++------ .github/workflows/compatibility_latest.yaml | 10 +++++----- .github/workflows/integration_api.yaml | 6 +++--- .github/workflows/integration_getter.yaml | 2 +- .github/workflows/integration_sender.yaml | 2 +- .github/workflows/release.yaml | 2 +- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/additional_tests.yaml b/.github/workflows/additional_tests.yaml index 7206796..5c0a4e9 100644 --- a/.github/workflows/additional_tests.yaml +++ b/.github/workflows/additional_tests.yaml @@ -66,13 +66,13 @@ jobs: sudo -u postgres createdb -O zabbix -E Unicode -T template0 zabbix cat schema.sql | sudo -u zabbix psql zabbix cat images.sql | sudo -u zabbix psql zabbix - cat data.sql | sudo -u zabbix psql zabbix + cat data.sql | sudo -u zabbix psql zabbix - name: Start Apache & Nginx run: | sudo apache2ctl start sudo nginx -g "daemon on; master_process on;" - name: Install python3 - run: | + run: | sudo apt-get install -y python3 python3-pip python-is-python3 pip install -r ./requirements.txt - name: Additional tests diff --git a/.github/workflows/compatibility_50.yaml b/.github/workflows/compatibility_50.yaml index d939fb4..d52c882 100644 --- a/.github/workflows/compatibility_50.yaml +++ b/.github/workflows/compatibility_50.yaml @@ -25,7 +25,7 @@ jobs: run: | curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/postgresql.gpg echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | sudo tee /etc/apt/sources.list.d/pgdg.list - sudo apt update && sudo apt install -y git sudo gcc make automake pkg-config postgresql-13 libpostgresql-ocaml-dev libxml2-dev libpcre3-dev libevent-dev apache2 libapache2-mod-php php8.1-pgsql php8.1-bcmath php8.1-xml php8.1-gd php8.1-ldap php8.1-mbstring libzip-dev + sudo apt update && sudo apt install -y git sudo gcc make automake pkg-config postgresql-13 libpostgresql-ocaml-dev libxml2-dev libpcre3-dev libevent-dev apache2 libapache2-mod-php php8.1-pgsql php8.1-bcmath php8.1-xml php8.1-gd php8.1-ldap php8.1-mbstring libzip-dev - name: Build from sources run: | WORKDIR=$(pwd) @@ -64,18 +64,18 @@ jobs: sudo -u postgres createdb -O zabbix -E Unicode -T template0 zabbix cat schema.sql | sudo -u zabbix psql zabbix cat images.sql | sudo -u zabbix psql zabbix - cat data.sql | sudo -u zabbix psql zabbix + cat data.sql | sudo -u zabbix psql zabbix sudo apache2ctl start - name: Start Zabbix server run: | - cd /tmp/zabbix-branch + cd /tmp/zabbix-branch sudo ./src/zabbix_server/zabbix_server -c ./conf/zabbix_server.conf - name: Start Zabbix agent run: | - cd /tmp/zabbix-branch + cd /tmp/zabbix-branch sudo ./src/zabbix_agent/zabbix_agentd -c ./conf/zabbix_agentd.conf - name: Install python3 - run: | + run: | sudo apt-get install -y python3 python3-pip python-is-python3 pip install -r ./requirements.txt - name: Wait for Zabbix API @@ -91,4 +91,4 @@ jobs: TBOT_CHAT: ${{ vars.TBOT_CHAT }} SUBJECT: Compatibility with Zabbix ${{ env.ZABBIX_VERSION }} FAIL run: | - tail -n1 /tmp/compatibility.log | grep "OK" 1>/dev/null || tail /tmp/compatibility.log | python ./.github/scripts/telegram_msg.py + tail -n1 /tmp/compatibility.log | grep "OK" 1>/dev/null || tail /tmp/compatibility.log | python ./.github/scripts/telegram_msg.py | exit 1 diff --git a/.github/workflows/compatibility_60.yaml b/.github/workflows/compatibility_60.yaml index 6b1817b..2ce68ba 100644 --- a/.github/workflows/compatibility_60.yaml +++ b/.github/workflows/compatibility_60.yaml @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v4 - name: Install packages run: | - sudo apt update && sudo apt install -y git sudo gcc make automake pkg-config postgresql-14 libpostgresql-ocaml-dev libxml2-dev libpcre3-dev libevent-dev apache2 libapache2-mod-php php8.1-pgsql php8.1-bcmath php8.1-xml php8.1-gd php8.1-ldap php8.1-mbstring libzip-dev + sudo apt update && sudo apt install -y git sudo gcc make automake pkg-config postgresql-14 libpostgresql-ocaml-dev libxml2-dev libpcre3-dev libevent-dev apache2 libapache2-mod-php php8.1-pgsql php8.1-bcmath php8.1-xml php8.1-gd php8.1-ldap php8.1-mbstring libzip-dev - name: Build from sources run: | WORKDIR=$(pwd) @@ -60,18 +60,18 @@ jobs: sudo -u postgres createdb -O zabbix -E Unicode -T template0 zabbix cat schema.sql | sudo -u zabbix psql zabbix cat images.sql | sudo -u zabbix psql zabbix - cat data.sql | sudo -u zabbix psql zabbix + cat data.sql | sudo -u zabbix psql zabbix sudo apache2ctl start - name: Start Zabbix server run: | - cd /tmp/zabbix-branch + cd /tmp/zabbix-branch sudo ./src/zabbix_server/zabbix_server -c ./conf/zabbix_server.conf - name: Start Zabbix agent run: | - cd /tmp/zabbix-branch + cd /tmp/zabbix-branch sudo ./src/zabbix_agent/zabbix_agentd -c ./conf/zabbix_agentd.conf - name: Install python3 - run: | + run: | sudo apt-get install -y python3 python3-pip python-is-python3 pip install -r ./requirements.txt - name: Wait for Zabbix API @@ -87,4 +87,4 @@ jobs: TBOT_CHAT: ${{ vars.TBOT_CHAT }} SUBJECT: Compatibility with Zabbix ${{ env.ZABBIX_VERSION }} FAIL run: | - tail -n1 /tmp/compatibility.log | grep "OK" 1>/dev/null || tail /tmp/compatibility.log | python ./.github/scripts/telegram_msg.py + tail -n1 /tmp/compatibility.log | grep "OK" 1>/dev/null || tail /tmp/compatibility.log | python ./.github/scripts/telegram_msg.py | exit 1 diff --git a/.github/workflows/compatibility_64.yaml b/.github/workflows/compatibility_64.yaml index f9f3b12..e26b192 100644 --- a/.github/workflows/compatibility_64.yaml +++ b/.github/workflows/compatibility_64.yaml @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v4 - name: Install packages run: | - sudo apt update && sudo apt install -y git sudo gcc make automake pkg-config postgresql-14 libpostgresql-ocaml-dev libxml2-dev libpcre3-dev libevent-dev apache2 libapache2-mod-php php8.1-pgsql php8.1-bcmath php8.1-xml php8.1-gd php8.1-ldap php8.1-mbstring libzip-dev + sudo apt update && sudo apt install -y git sudo gcc make automake pkg-config postgresql-14 libpostgresql-ocaml-dev libxml2-dev libpcre3-dev libevent-dev apache2 libapache2-mod-php php8.1-pgsql php8.1-bcmath php8.1-xml php8.1-gd php8.1-ldap php8.1-mbstring libzip-dev - name: Build from sources run: | WORKDIR=$(pwd) @@ -60,18 +60,18 @@ jobs: sudo -u postgres createdb -O zabbix -E Unicode -T template0 zabbix cat schema.sql | sudo -u zabbix psql zabbix cat images.sql | sudo -u zabbix psql zabbix - cat data.sql | sudo -u zabbix psql zabbix + cat data.sql | sudo -u zabbix psql zabbix sudo apache2ctl start - name: Start Zabbix server run: | - cd /tmp/zabbix-branch + cd /tmp/zabbix-branch sudo ./src/zabbix_server/zabbix_server -c ./conf/zabbix_server.conf - name: Start Zabbix agent run: | - cd /tmp/zabbix-branch + cd /tmp/zabbix-branch sudo ./src/zabbix_agent/zabbix_agentd -c ./conf/zabbix_agentd.conf - name: Install python3 - run: | + run: | sudo apt-get install -y python3 python3-pip python-is-python3 pip install -r ./requirements.txt - name: Wait for Zabbix API @@ -87,4 +87,4 @@ jobs: TBOT_CHAT: ${{ vars.TBOT_CHAT }} SUBJECT: Compatibility with Zabbix ${{ env.ZABBIX_VERSION }} FAIL run: | - tail -n1 /tmp/compatibility.log | grep "OK" 1>/dev/null || tail /tmp/compatibility.log | python ./.github/scripts/telegram_msg.py + tail -n1 /tmp/compatibility.log | grep "OK" 1>/dev/null || tail /tmp/compatibility.log | python ./.github/scripts/telegram_msg.py | exit 1 diff --git a/.github/workflows/compatibility_latest.yaml b/.github/workflows/compatibility_latest.yaml index 9eabcaa..2cc3135 100644 --- a/.github/workflows/compatibility_latest.yaml +++ b/.github/workflows/compatibility_latest.yaml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 - name: Install packages run: | - sudo apt update && sudo apt install -y git sudo gcc make automake pkg-config postgresql-14 libpostgresql-ocaml-dev libxml2-dev libpcre3-dev libevent-dev apache2 libapache2-mod-php php8.1-pgsql php8.1-bcmath php8.1-xml php8.1-gd php8.1-ldap php8.1-mbstring libzip-dev + sudo apt update && sudo apt install -y git sudo gcc make automake pkg-config postgresql-14 libpostgresql-ocaml-dev libxml2-dev libpcre3-dev libevent-dev apache2 libapache2-mod-php php8.1-pgsql php8.1-bcmath php8.1-xml php8.1-gd php8.1-ldap php8.1-mbstring libzip-dev - name: Build from sources run: | WORKDIR=$(pwd) @@ -57,7 +57,7 @@ jobs: sudo -u postgres createdb -O zabbix -E Unicode -T template0 zabbix cat schema.sql | sudo -u zabbix psql zabbix cat images.sql | sudo -u zabbix psql zabbix - cat data.sql | sudo -u zabbix psql zabbix + cat data.sql | sudo -u zabbix psql zabbix sudo apache2ctl start - name: Start Zabbix server run: | @@ -65,10 +65,10 @@ jobs: sudo ./src/zabbix_server/zabbix_server -c ./conf/zabbix_server.conf - name: Start Zabbix agent run: | - cd /tmp/zabbix-branch + cd /tmp/zabbix-branch sudo ./src/zabbix_agent/zabbix_agentd -c ./conf/zabbix_agentd.conf - name: Install python3 - run: | + run: | sudo apt-get install -y python3 python3-pip python-is-python3 pip install -r ./requirements.txt - name: Wait for Zabbix API @@ -88,4 +88,4 @@ jobs: TBOT_CHAT: ${{ vars.TBOT_CHAT }} SUBJECT: Compatibility with Zabbix ${{ env.ZABBIX_VERSION }} FAIL run: | - tail -n1 /tmp/compatibility.log | grep "OK" 1>/dev/null || tail /tmp/compatibility.log | python ./.github/scripts/telegram_msg.py + tail -n1 /tmp/compatibility.log | grep "OK" 1>/dev/null || tail /tmp/compatibility.log | python ./.github/scripts/telegram_msg.py | exit 1 diff --git a/.github/workflows/integration_api.yaml b/.github/workflows/integration_api.yaml index d89d4db..6660097 100644 --- a/.github/workflows/integration_api.yaml +++ b/.github/workflows/integration_api.yaml @@ -27,7 +27,7 @@ jobs: - uses: actions/checkout@v4 - name: Install packages run: | - sudo apt update && sudo apt install -y git sudo gcc make automake pkg-config postgresql-14 libpostgresql-ocaml-dev libxml2-dev libpcre3-dev libevent-dev apache2 libapache2-mod-php php8.1-pgsql php8.1-bcmath php8.1-xml php8.1-gd php8.1-ldap php8.1-mbstring libzip-dev + sudo apt update && sudo apt install -y git sudo gcc make automake pkg-config postgresql-14 libpostgresql-ocaml-dev libxml2-dev libpcre3-dev libevent-dev apache2 libapache2-mod-php php8.1-pgsql php8.1-bcmath php8.1-xml php8.1-gd php8.1-ldap php8.1-mbstring libzip-dev - name: Build from sources run: | WORKDIR=$(pwd) @@ -63,10 +63,10 @@ jobs: sudo -u postgres createdb -O zabbix -E Unicode -T template0 zabbix cat schema.sql | sudo -u zabbix psql zabbix cat images.sql | sudo -u zabbix psql zabbix - cat data.sql | sudo -u zabbix psql zabbix + cat data.sql | sudo -u zabbix psql zabbix sudo apache2ctl start - name: Install python3 - run: | + run: | sudo apt-get install -y python3 python3-pip python-is-python3 pip install -r ./requirements.txt - name: Wait for Zabbix API diff --git a/.github/workflows/integration_getter.yaml b/.github/workflows/integration_getter.yaml index 7280355..fa4f0eb 100644 --- a/.github/workflows/integration_getter.yaml +++ b/.github/workflows/integration_getter.yaml @@ -39,7 +39,7 @@ jobs: run: | sudo zabbix_agentd -c /etc/zabbix/zabbix_agentd.conf - name: Install python3 - run: | + run: | sudo apt-get install -y python3 python3-pip python-is-python3 pip install -r ./requirements.txt - name: Integration synchronous test diff --git a/.github/workflows/integration_sender.yaml b/.github/workflows/integration_sender.yaml index 528f7cc..07edaef 100644 --- a/.github/workflows/integration_sender.yaml +++ b/.github/workflows/integration_sender.yaml @@ -40,7 +40,7 @@ jobs: run: | sudo zabbix_proxy -c /etc/zabbix/zabbix_proxy.conf - name: Install python3 - run: | + run: | sudo apt-get install -y python3 python3-pip python-is-python3 pip install -r ./requirements.txt - name: Integration synchronous test diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1d0c5f2..2a26376 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -12,7 +12,7 @@ jobs: release: name: Release new version runs-on: ubuntu-latest - + steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5