add allure compatibility

.github/workflows/ci.yaml

@@ -99,8 +99,8 @@ jobs:
           USER_UUID: ${{ steps.secrets.outputs.user_uuid }}
           USER_SECRET: ${{ steps.secrets.outputs.user_secret }}
           WALLARM_API_TOKEN: ${{ steps.secrets.outputs.api_token }}
-          ALLURE_TOKEN: ${{ secrets.ALLURE_SERVER_TOKEN }}
-          ALLURE_ENDPOINT: ${{ secrets.ALLURE_SERVER_URL }}
-          ALLURE_PROJECT_ID: ${{ secrets.ALLURE_PROJECT_ID }}
+          ALLURE_TOKEN: ${{ steps.secrets.outputs.ALLURE_SERVER_TOKEN }}
+          ALLURE_ENDPOINT: ${{ steps.secrets.outputs.ALLURE_SERVER_URL }}
+          ALLURE_PROJECT_ID: ${{ steps.secrets.outputs.ALLURE_PROJECT_ID }}
           ALLURE_ENVIRONMENT_ARCH: ${{ matrix.ARCH }}
         run: make ${{ matrix.case }}

.gitignore

@@ -1,2 +1,3 @@
 .env
-build
+build
+.idea

Makefile

@@ -16,12 +16,14 @@ REGISTRY     := docker.io/wallarm
 IMAGE 	     ?= $(REGISTRY)/node:$(CONTAINER_VERSION)
 IMAGE_LATEST := $(REGISTRY)/node:latest
 
-RAND_NUM="${RANDOM}${RANDOM}${RANDOM}"
-RAND_NUM=${RAND_NUM:0:10}
-
+RAND_NUM := $(shell echo $$RANDOM$$RANDOM$$RANDOM | cut -c 1-10)
 COMPOSE_CMD = NODE_IMAGE=$(IMAGE) docker-compose -p $@ -f test/docker-compose.$@.yaml
 NODE_UUID   = $(COMPOSE_CMD) exec node cat /opt/wallarm/etc/wallarm/node.yaml | grep uuid | awk '{print $$2}'
-PYTEST_CMD  = $(COMPOSE_CMD) exec -e NODE_UUID=$$($(NODE_UUID)) allurectl watch --job-uid ${RAND_NUM} -- pytest -n $(PYTEST_WORKERS) $(PYTEST_ARGS)
+GITHUB_VARS_CMD = env | awk -F '=' '/^GITHUB_/ {print "-e " $$1 "=" $$2}'
+GITHUB_VARS     = $(shell $(GITHUB_VARS_CMD))
+PYTEST_CMD  = $(COMPOSE_CMD) exec $(GITHUB_VARS) -e NODE_UUID=$(NODE_UUID) \
+              pytest allurectl watch --job-uid $(RAND_NUM) -- \
+              pytest -n $(PYTEST_WORKERS) $(PYTEST_ARGS)
 
 ### Variables required to run test
 .EXPORT_ALL_VARIABLES:

test/docker-compose.single.yaml

@@ -19,6 +19,7 @@ services:
     image: dkr.wallarm.com/tests/smoke-tests:latest
     environment:
       WALLARM_API_HOST: ${WALLARM_API_HOST}
+      WALLARM_API_PRESET: ${WALLARM_API_PRESET:-eu1}
       WALLARM_API_CA_VERIFY: ${WALLARM_API_CA_VERIFY}
       CLIENT_ID: ${CLIENT_ID}
       USER_UUID: ${USER_UUID}
@@ -38,8 +39,7 @@ services:
           BRANCH:${GITHUB_REF_NAME:-local},
           JOB:${GITHUB_JOB:-local},
           ARCH:${ALLURE_ENVIRONMENT_ARCH:-}
-      ALLURE_LAUNCH_NAME: ${GITHUB_WORKFLOW:-local}-${GITHUB_RUN_ID:-local}-${GITHUB_JOB:-local}-
-          ${ALLURE_ENVIRONMENT_K8S:-}-${ALLURE_ENVIRONMENT_ARCH:-}
+      ALLURE_LAUNCH_NAME: ${GITHUB_WORKFLOW:-local}-${GITHUB_RUN_ID:-local}-${GITHUB_JOB:-local}-${ALLURE_ENVIRONMENT_ARCH:-}
     entrypoint: '/bin/sleep'
     command:
       - infinity

test/docker-compose.split.yaml

@@ -34,6 +34,7 @@ services:
     image: dkr.wallarm.com/tests/smoke-tests:latest
     environment:
       WALLARM_API_HOST: ${WALLARM_API_HOST}
+      WALLARM_API_PRESET: ${WALLARM_API_PRESET:-eu1}
       WALLARM_API_CA_VERIFY: ${WALLARM_API_CA_VERIFY}
       CLIENT_ID: ${CLIENT_ID}
       USER_UUID: ${USER_UUID}
@@ -53,8 +54,7 @@ services:
         BRANCH:${GITHUB_REF_NAME:-local},
         JOB:${GITHUB_JOB:-local},
         ARCH:${ALLURE_ENVIRONMENT_ARCH:-}
-      ALLURE_LAUNCH_NAME: ${GITHUB_WORKFLOW:-local}-${GITHUB_RUN_ID:-local}-${GITHUB_JOB:-local}-
-        ${ALLURE_ENVIRONMENT_K8S:-}-${ALLURE_ENVIRONMENT_ARCH:-}
+      ALLURE_LAUNCH_NAME: ${GITHUB_WORKFLOW:-local}-${GITHUB_RUN_ID:-local}-${GITHUB_JOB:-local}-${ALLURE_ENVIRONMENT_ARCH:-}
     entrypoint: '/bin/sleep'
     command:
       - infinity