Release 4.10.1

wallarm · Feb 15, 2024 · 5d58681 · 5d58681
1 parent fdbd37e
commit 5d58681
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -110,7 +110,6 @@ jobs:
           ALLURE_PROJECT_ID: ${{ steps.secrets.outputs.ALLURE_PROJECT_ID }}
           ALLURE_ENVIRONMENT_ARCH: ${{ matrix.ARCH }}
           ALLURE_UPLOAD_REPORT: true
-          TEST_RC: 'True'
         run: make ${{ matrix.case }}
 
   scan:

diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ SHELL=/bin/bash -o pipefail -o errexit
 
 -include .env
 
-AIO_VERSION       ?= 4.10.0
+AIO_VERSION       ?= 4.10.1
 CONTAINER_VERSION ?= test
 ALPINE_VERSION    = 3.18
 NGINX_VERSION     = 1.24.0
@@ -19,6 +19,7 @@ IMAGE 	     ?= $(REGISTRY)/node:$(CONTAINER_VERSION)
 IMAGE_LATEST := $(REGISTRY)/node:latest
 
 RAND_NUM := $(shell echo $$RANDOM$$RANDOM$$RANDOM | cut -c 1-10)
+NODE_VERSION ?= $(shell echo $(AIO_VERSION) | awk -F'[-.]' '{print $$1"."$$2"."$$3}')
 COMPOSE_CMD = NODE_IMAGE=$(IMAGE) docker-compose -p $@ -f test/docker-compose.$@.yaml
 NODE_UUID_CMD = $(COMPOSE_CMD) exec node cat /opt/wallarm/etc/wallarm/node.yaml | grep uuid | awk '{print $$2}'
 NODE_UUID = $(shell $(NODE_UUID_CMD))

diff --git a/scripts/init b/scripts/init
@@ -172,9 +172,9 @@ if [ x"$POSTANALYTIC_ONLY" = x"true" ] \
   || [ x"$POSTANALYTIC_ONLY" = x"True" ] \
   || [ x"$POSTANALYTIC_ONLY" = x"yes" ]
 then
-  exec /opt/wallarm/usr/bin/python3.8 /opt/wallarm/usr/bin/supervisord -n -c /opt/wallarm/etc/supervisord.conf
+  exec /opt/wallarm/usr/bin/python3.10 /opt/wallarm/usr/bin/supervisord -n -c /opt/wallarm/etc/supervisord.conf
 else
-  /opt/wallarm/usr/bin/python3.8 /opt/wallarm/usr/bin/supervisord -n -c /opt/wallarm/etc/supervisord.conf &
+  /opt/wallarm/usr/bin/python3.10 /opt/wallarm/usr/bin/supervisord -n -c /opt/wallarm/etc/supervisord.conf &
   sleep 1
   exec /usr/sbin/nginx -g "daemon off;"
 fi
diff --git a/test/docker-compose.single.yaml b/test/docker-compose.single.yaml
@@ -29,7 +29,7 @@ services:
       NODE_BASE_URL: http://node
       HOSTNAME_OLD_NODE: smoke-tests-old-node
       ALLURE_ENVIRONMENT_ARCH: ${ALLURE_ENVIRONMENT_ARCH}
-      TEST_RC: ${TEST_RC}
+      NODE_VERSION: ${NODE_VERSION}
       ALLURE_PROJECT_ID: ${ALLURE_PROJECT_ID}
       ALLURE_TOKEN: ${ALLURE_TOKEN}
       ALLURE_ENDPOINT: ${ALLURE_ENDPOINT}

diff --git a/test/docker-compose.split.yaml b/test/docker-compose.split.yaml
@@ -44,7 +44,7 @@ services:
       NODE_BASE_URL: http://node
       HOSTNAME_OLD_NODE: smoke-tests-old-node
       ALLURE_ENVIRONMENT_ARCH: ${ALLURE_ENVIRONMENT_ARCH}
-      TEST_RC: ${TEST_RC}
+      NODE_VERSION: ${NODE_VERSION}
       ALLURE_PROJECT_ID: ${ALLURE_PROJECT_ID}
       ALLURE_TOKEN: ${ALLURE_TOKEN}
       ALLURE_ENDPOINT: ${ALLURE_ENDPOINT}

diff --git a/test/nginx_conf/nginx_node.conf b/test/nginx_conf/nginx_node.conf
@@ -5,7 +5,8 @@ server { # Example of a local backend
                 return 200;
         }
         location /api-discovery-test {
-                return 200;
+                add_header Api-Discovery-Header "Hello, I am header!";
+                return 200 '{"json_response": "Hello, I am json"}';
                 default_type application/json;
         }