Merge pull request #159 from reportportal/rc/5.11.0

Release 5.11.0

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 5.7.3-SNAPSHOT
+current_version = 5.11.0
 commit = True
 tag = True
 parse = (?P<major>\d+)(\.(?P<minor>\d+))?(\.(?P<patch>\d+))?(\-(?P<release>[a-zA-Z]+))?(\-(?P<releasenum>[a-zA-Z]+))?(\-(?P<snapshot>[a-zA-Z]+))?(\-(?P<build>\d+))?

.github/workflows/build-dev-image.yml

@@ -0,0 +1,35 @@
+name: Build develop Docker image
+
+on:
+  push:
+    branches:
+      - develop
+    paths-ignore:
+      - '.github/**'
+      - README.md
+
+jobs:
+  variables-setup:
+    name: Setting variables for docker build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Create variables
+        id: vars
+        run: |
+          echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+    outputs:
+      date: ${{ steps.vars.outputs.date }}
+
+  call-docker-build:
+    name: Call develop Docker build
+    needs: variables-setup
+    uses: reportportal/.github/.github/workflows/build-docker-image.yaml@main
+    with:
+      aws-region: ${{ vars.AWS_REGION }}
+      image-tag: 'develop-${{ github.run_number }}'
+      version: 'develop-${{ github.run_number }}'
+      date: ${{ needs.variables-setup.outputs.date }}
+    secrets: inherit

.github/workflows/build-feature-image.yaml

@@ -0,0 +1,37 @@
+name: Build feature Docker image
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+    branches:
+      - 'develop'
+
+jobs:
+  variables-setup:
+    name: Setting variables for docker build
+    runs-on: ubuntu-latest
+    if: (!startsWith(github.head_ref, 'rc/') || !startsWith(github.head_ref, 'hotfix/') || !startsWith(github.head_ref, 'master') || !startsWith(github.head_ref, 'main'))
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Create variables
+        id: vars
+        run: |
+          echo "tag=$(echo ${{ github.head_ref }}-${{ github.run_number }} | tr '/' '-')" >> $GITHUB_OUTPUT
+          echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+    outputs:
+      tag: ${{ steps.vars.outputs.tag }}
+      date: ${{ steps.vars.outputs.date }}
+
+  call-docker-build:
+    name: Call feature Docker build
+    needs: variables-setup
+    uses: reportportal/.github/.github/workflows/build-docker-image.yaml@main
+    with:
+      aws-region: ${{ vars.AWS_REGION }}
+      image-tag: ${{ needs.variables-setup.outputs.tag }}
+      version: ${{ needs.variables-setup.outputs.tag }}
+      branch: ${{ github.head_ref }}
+      date: ${{ needs.variables-setup.outputs.date }}
+    secrets: inherit

.github/workflows/build-rc-image.yaml

@@ -0,0 +1,42 @@
+name: Build RC Docker image
+
+on:
+  push:
+    branches:
+      - "rc/*"
+      - "hotfix/*"
+
+jobs:
+  variables-setup:
+    name: Setting variables for docker build
+    runs-on: ubuntu-latest
+    environment: rc
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Create variables
+        id: vars
+        run: |
+          echo "platforms=${{ vars.BUILD_PLATFORMS }}" >> $GITHUB_OUTPUT
+          echo "version=$(echo '${{ github.ref_name }}' | sed -nE 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/p')" >> $GITHUB_OUTPUT
+          echo "tag=$(echo ${{ github.ref_name }}-${{ github.run_number }} | tr '/' '-')" >> $GITHUB_OUTPUT
+          echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+    outputs:
+      platforms: ${{ steps.vars.outputs.platforms }}
+      version: ${{ steps.vars.outputs.version }}
+      tag: ${{ steps.vars.outputs.tag }}
+      date: ${{ steps.vars.outputs.date }}
+
+  call-docker-build:
+    name: Call release candidate Docker build
+    needs: variables-setup
+    uses: reportportal/.github/.github/workflows/build-docker-image.yaml@main
+    with:
+      aws-region: ${{ vars.AWS_REGION }}
+      image-tag: ${{ needs.variables-setup.outputs.tag }}
+      additional-tag: 'latest'
+      build-platforms: ${{ needs.variables-setup.outputs.platforms }}
+      version: ${{ needs.variables-setup.outputs.version }}
+      date: ${{ needs.variables-setup.outputs.date }}
+    secrets: inherit

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 
-## [Unreleased]
+## [5.11.0]
+### Added
+- `MINIO_USE_TLS` environment variable to address [Issue #136](https://github.com/reportportal/service-auto-analyzer/issues/136), by @HardNorth
+- `CURRENT_AND_THE_SAME_NAME` and `PREVIOUS_LAUNCH` analyze options handling, by @HardNorth
+- `launch_number` data parameter indexing and usage, by @HardNorth
+- `previousLaunchId` request parameter handling, by @HardNorth
+### Changed
+- Suggestions now do not hide other launches, which do not suite Analyzer configuration, just put them lower in priority, by @HardNorth
+
+
+## [5.10.0]
 ### Changed
 - Global structure update
 - Deprecated `unique_id` field changed to `test_case_hash`, by @HardNorth

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM} python:3.10.12 as test
+FROM --platform=${BUILDPLATFORM} python:3.10.13 as test
 RUN apt-get update && apt-get install -y build-essential \
     && rm -rf /var/lib/apt/lists/* \
     && python -m venv /venv \
@@ -14,8 +14,8 @@ RUN "${VIRTUAL_ENV}/bin/pip" install --no-cache-dir -r requirements-dev.txt
 RUN make test-all
 
 
-FROM --platform=${BUILDPLATFORM} python:3.10.12 as builder
-RUN apt-get update && apt-get install -y build-essential \
+FROM --platform=${BUILDPLATFORM} python:3.10.13 as builder
+RUN apt-get update && apt-get install -y build-essential libpcre3 libpcre3-dev \
     && rm -rf /var/lib/apt/lists/* \
     && python -m venv /venv \
     && mkdir /build
@@ -36,21 +36,25 @@ RUN mkdir /backend \
     && cp -r /build/res /backend/
 
 
-FROM --platform=${BUILDPLATFORM} python:3.10.12-slim
-RUN apt-get update && apt-get -y upgrade \
-    && apt-get install -y libxml2 libgomp1 curl \
-    && rm -rf /var/lib/apt/lists/*
-COPY --from=builder /venv /venv
-RUN mkdir /usr/share/nltk_data && chmod g+w /usr/share/nltk_data
-COPY --from=builder /usr/share/nltk_data /usr/share/nltk_data/
+FROM --platform=${BUILDPLATFORM} python:3.10.13-slim
 WORKDIR /backend/
 COPY --from=builder /backend ./
+COPY --from=builder /venv /venv
+COPY --from=builder /usr/share/nltk_data /usr/share/nltk_data/
+RUN apt-get update && apt-get -y upgrade \
+    && apt-get install -y libxml2 libgomp1 curl libpcre3 libpcre3-dev \
+    && rm -rf /var/lib/apt/lists/* \
+    && mkdir -p -m 0700 /backend/storage \
+    && groupadd uwsgi && useradd -g uwsgi uwsgi \
+    && chown -R uwsgi: /usr/share/nltk_data \
+    && chown -R uwsgi: /backend
+USER uwsgi
 EXPOSE 5001
 ENV VIRTUAL_ENV="/venv"
 # uWSGI configuration (customize as needed):
 ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" PYTHONPATH=/backend \
     FLASK_APP=app/main.py UWSGI_WSGI_FILE=app/main.py UWSGI_SOCKET=:3031 UWSGI_HTTP=:5001 \
-    UWSGI_VIRTUALENV=${VIRTUAL_ENV} UWSGI_MASTER=1 UWSGI_WORKERS=4 UWSGI_THREADS=8 UWSGI_LAZY_APPS=1 \
+    UWSGI_VIRTUALENV=${VIRTUAL_ENV} UWSGI_MASTER=1 UWSGI_WORKERS=4 UWSGI_THREADS=8 UWSGI_MAX_FD=10000 UWSGI_LAZY_APPS=1 \
     UWSGI_WSGI_ENV_BEHAVIOR=holy PYTHONDONTWRITEBYTECODE=1
 # Start uWSGI
 CMD ["/venv/bin/uwsgi", "--http-auto-chunked", "--http-keepalive"]