-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #101 from reportportal/rc/5.10.0
Release 5.10.0
- Loading branch information
Showing
43 changed files
with
1,841 additions
and
147 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| name: Retag RC Docker image | ||
|
|
||
| on: | ||
| pull_request_review: | ||
| types: [submitted] | ||
|
|
||
| env: | ||
| AWS_REGION: ${{ vars.AWS_REGION }} # set this to your preferred AWS region, e.g. us-west-1 | ||
| ECR_REPOSITORY: ${{ vars.ECR_REPOSITORY }} # set this to your Amazon ECR repository name | ||
| TARGET_REGISTRY: ${{ vars.TARGET_REGISTRY }} # set to target regestry (DockerHub, GitHub & etc) | ||
| TARGET_REPOSITORY: ${{ vars.TARGET_REPOSITORY }} # set to target repository | ||
| PLATFORMS: ${{ vars.BUILD_PLATFORMS }} # set target build platforms. By default linux/amd64 | ||
| RELEASE_MODE: ${{ vars.RELEASE_MODE }} | ||
|
|
||
| jobs: | ||
| retag-image: | ||
| name: Retag and push image | ||
| runs-on: ubuntu-latest | ||
| environment: rc | ||
| if: github.event.pull_request.base.ref == 'master' || github.event.pull_request.base.ref == 'main' | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Configure AWS credentials | ||
| uses: aws-actions/configure-aws-credentials@v2 | ||
| with: | ||
| # role-to-assume: arn:aws:iam::123456789012:role/my-github-actions-role | ||
| aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} | ||
| aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} | ||
| aws-region: ${{ env.AWS_REGION }} | ||
|
|
||
| - name: Login to Amazon ECR | ||
| id: login-ecr | ||
| uses: aws-actions/amazon-ecr-login@v1 | ||
| with: | ||
| mask-password: 'true' | ||
|
|
||
| - name: Log in to Docker Hub | ||
| uses: docker/login-action@v3 | ||
| with: | ||
| username: ${{ secrets.REGESTRY_USERNAME }} | ||
| password: ${{ secrets.REGESTRY_PASSWORD }} | ||
|
|
||
| - name: Create variables | ||
| id: vars | ||
| run: | | ||
| echo "tag=$(echo '${{ github.event.pull_request.title }}' | sed -nE 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/p')" >> $GITHUB_OUTPUT | ||
| - name: Set up QEMU | ||
| uses: docker/setup-qemu-action@v2 | ||
|
|
||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v2 | ||
|
|
||
| - name: Retag and Push Docker Image | ||
| env: | ||
| ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} | ||
| IMAGE_TAG: ${{ steps.vars.outputs.tag }} | ||
| run: | | ||
| docker buildx imagetools create $ECR_REGISTRY/$ECR_REPOSITORY:latest --tag $TARGET_REGISTRY/$TARGET_REPOSITORY:$IMAGE_TAG --tag $TARGET_REGISTRY/$TARGET_REPOSITORY:latest | ||
| - name: Summarize | ||
| env: | ||
| ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} | ||
| IMAGE_TAG: ${{ steps.vars.outputs.tag }} | ||
| run: | | ||
| echo "## General information about the build:" >> $GITHUB_STEP_SUMMARY | ||
| echo "" >> $GITHUB_STEP_SUMMARY | ||
| echo "- :whale: Docker image: $TARGET_REGISTRY/$TARGET_REPOSITORY:$IMAGE_TAG" >> $GITHUB_STEP_SUMMARY | ||
| echo "- :octocat: The commit SHA from which the build was performed: [$GITHUB_SHA](https://github.com/$GITHUB_REPOSITORY/commit/$GITHUB_SHA)" >> $GITHUB_STEP_SUMMARY |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| name: Build RC Docker image | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - "rc/*" | ||
| - "hotfix/*" | ||
|
|
||
| env: | ||
| AWS_REGION: ${{ vars.AWS_REGION }} # set this to your preferred AWS region, e.g. us-west-1 | ||
| ECR_REPOSITORY: ${{ vars.ECR_REPOSITORY }} # set this to your Amazon ECR repository name | ||
| PLATFORMS: ${{ vars.BUILD_PLATFORMS }} # set target build platforms. By default linux/amd64 | ||
| RELEASE_MODE: ${{ vars.RELEASE_MODE }} | ||
|
|
||
| jobs: | ||
| build-and-export: | ||
| name: Build and export to AWS ECR | ||
| runs-on: ubuntu-latest | ||
| environment: rc | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Configure AWS credentials | ||
| uses: aws-actions/configure-aws-credentials@v2 | ||
| with: | ||
| # role-to-assume: arn:aws:iam::123456789012:role/my-github-actions-role | ||
| aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} | ||
| aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} | ||
| aws-region: ${{ env.AWS_REGION }} | ||
|
|
||
| - name: Login to Amazon ECR | ||
| id: login-ecr | ||
| uses: aws-actions/amazon-ecr-login@v1 | ||
| with: | ||
| mask-password: 'true' | ||
|
|
||
| - name: Create variables | ||
| id: vars | ||
| run: | | ||
| echo "tag=$(echo ${{ github.ref_name }} | tr '/' '-')" >> $GITHUB_OUTPUT | ||
| echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT | ||
| echo "version=$(echo '${{ github.ref_name }}' | sed -nE 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/p')" >> $GITHUB_OUTPUT | ||
| - name: Set up QEMU | ||
| uses: docker/setup-qemu-action@v2 | ||
|
|
||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v2 | ||
|
|
||
| - name: Build | ||
| uses: docker/build-push-action@v4 | ||
| env: | ||
| VERSION: ${{ steps.vars.outputs.version }} | ||
| DATE: ${{ steps.vars.outputs.date }} | ||
| IMAGE_TAG: ${{ steps.vars.outputs.tag }} | ||
| ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} | ||
| with: | ||
| context: . | ||
| push: true | ||
| build-args: | | ||
| APP_VERSION=${{ env.VERSION }} | ||
| BUILD_DATE=${{ env.DATE }} | ||
| GITHUB_USER=${{ secrets.GH_USER }} | ||
| GITHUB_TOKEN=${{ secrets.GH_TOKEN }} | ||
| RELEASE_MODE=${{ env.RELEASE_MODE }} | ||
| platforms: ${{ env.PLATFORMS }} | ||
| tags: | | ||
| ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }} | ||
| ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:latest | ||
| - name: Run Trivy vulnerability scanner | ||
| uses: aquasecurity/trivy-action@master | ||
| env: | ||
| IMAGE_TAG: ${{ steps.vars.outputs.tag }} | ||
| ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} | ||
| with: | ||
| image-ref: '${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}' | ||
| format: 'table' | ||
| exit-code: '0' | ||
| ignore-unfixed: true | ||
| vuln-type: 'os,library' | ||
| severity: 'CRITICAL,HIGH' | ||
|
|
||
| - name: Summarize | ||
| env: | ||
| ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} | ||
| IMAGE_TAG: ${{ steps.vars.outputs.tag }} | ||
| run: | | ||
| echo "## General information about the build:" >> $GITHUB_STEP_SUMMARY | ||
| echo "" >> $GITHUB_STEP_SUMMARY | ||
| echo "- :gift: Docker image in Amazon ECR: ecr/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_STEP_SUMMARY | ||
| echo "- :octocat: The commit SHA from which the build was performed: [$GITHUB_SHA](https://github.com/$GITHUB_REPOSITORY/commit/$GITHUB_SHA)" >> $GITHUB_STEP_SUMMARY |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,26 @@ | ||
| FROM alpine:latest | ||
| LABEL version=5.8.2 description="EPAM Report portal. Service jobs" maintainer="Andrei Varabyeu <[email protected]>, Hleb Kanonik <[email protected]>" | ||
| ARG GH_TOKEN | ||
| RUN echo 'exec java ${JAVA_OPTS} -jar service-jobs-5.8.2-exec.jar' > /start.sh && chmod +x /start.sh && \ | ||
| wget --header="Authorization: Bearer ${GH_TOKEN}" -q https://maven.pkg.github.com/reportportal/service-jobs/com/epam/reportportal/service-jobs/5.8.2/service-jobs-5.8.2-exec.jar | ||
| ENV JAVA_OPTS="-Xmx512m -XX:+UseG1GC -XX:InitiatingHeapOccupancyPercent=70 -Djava.security.egd=file:/dev/./urandom" | ||
| FROM gradle:6.8.3-jdk11 AS build | ||
| ARG RELEASE_MODE | ||
| ARG APP_VERSION | ||
| ARG GITHUB_USER | ||
| ARG GITHUB_TOKEN | ||
| WORKDIR /usr/app | ||
| COPY . /usr/app | ||
| RUN if [ "${RELEASE_MODE}" = true ]; then \ | ||
| gradle build --exclude-task test \ | ||
| -PreleaseMode=true \ | ||
| -PgithubUserName=${GITHUB_USER} \ | ||
| -PgithubToken=${GITHUB_TOKEN} \ | ||
| -Dorg.gradle.project.version=${APP_VERSION}; \ | ||
| else gradle build --exclude-task test -Dorg.gradle.project.version=${APP_VERSION}; fi | ||
|
|
||
| # For ARM build use flag: `--platform linux/arm64` | ||
| FROM --platform=$BUILDPLATFORM amazoncorretto:11.0.20 | ||
| LABEL version=${APP_VERSION} description="EPAM Report portal. Jobs Service" maintainer="Andrei Varabyeu <[email protected]>, Hleb Kanonik <[email protected]>" | ||
| ARG APP_VERSION=${APP_VERSION} | ||
| ENV APP_DIR=/usr/app | ||
| ENV JAVA_OPTS="-Xmx1g -XX:+UseG1GC -XX:InitiatingHeapOccupancyPercent=70 -Djava.security.egd=file:/dev/./urandom" | ||
| WORKDIR $APP_DIR | ||
| COPY --from=build $APP_DIR/build/libs/service-jobs-*exec.jar . | ||
| VOLUME ["/tmp"] | ||
| EXPOSE 8080 | ||
| ENTRYPOINT ./start.sh | ||
| ENTRYPOINT exec java ${JAVA_OPTS} -jar ${APP_DIR}/service-jobs-*exec.jar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| version=5.8.3 | ||
| version=5.10.0 | ||
| description=EPAM Report portal. Service jobs | ||
| dockerServerUrl=unix:///var/run/docker.sock | ||
| dockerPrepareEnvironment= | ||
| dockerJavaOpts=-Xmx512m -XX:+UseG1GC -XX:InitiatingHeapOccupancyPercent=70 -Djava.security.egd=file:/dev/./urandom | ||
| dockerJavaOpts=-Xmx512m -XX:+UseG1GC -XX:InitiatingHeapOccupancyPercent=70 -Djava.security.egd=file:/dev/./urandom |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
src/main/java/com/epam/reportportal/analyzer/AnalyzerUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * Copyright 2023 EPAM Systems | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.epam.reportportal.analyzer; | ||
|
|
||
| import static java.util.Optional.ofNullable; | ||
|
|
||
| import com.rabbitmq.http.client.domain.ExchangeInfo; | ||
| import java.util.function.Predicate; | ||
| import java.util.function.ToIntFunction; | ||
| import org.apache.commons.lang3.BooleanUtils; | ||
| import org.apache.commons.lang3.math.NumberUtils; | ||
|
|
||
| /** | ||
| * @author Andrei Piankouski | ||
| */ | ||
| public final class AnalyzerUtils { | ||
|
|
||
| static final String ANALYZER_KEY = "analyzer"; | ||
| static final String ANALYZER_PRIORITY = "analyzer_priority"; | ||
| static final String ANALYZER_INDEX = "analyzer_index"; | ||
| static final String ANALYZER_LOG_SEARCH = "analyzer_log_search"; | ||
| static final String ANALYZER_SUGGEST = "analyzer_suggest"; | ||
| static final String ANALYZER_CLUSTER = "analyzer_cluster"; | ||
|
|
||
| /** | ||
| * Comparing by client service priority | ||
| */ | ||
| public static final ToIntFunction<ExchangeInfo> EXCHANGE_PRIORITY = it -> ofNullable(it.getArguments() | ||
| .get(ANALYZER_PRIORITY)).map(val -> NumberUtils.toInt(val.toString(), Integer.MAX_VALUE)).orElse(Integer.MAX_VALUE); | ||
|
|
||
| /** | ||
| * Checks if service support items indexing. <code>false</code> | ||
| * by default | ||
| */ | ||
| public static final Predicate<ExchangeInfo> DOES_SUPPORT_INDEX = it -> ofNullable(it.getArguments() | ||
| .get(ANALYZER_INDEX)).map(val -> BooleanUtils.toBoolean(val.toString())).orElse(false); | ||
|
|
||
| /** | ||
| * Checks if service support logs searching. <code>false</code> | ||
| * by default | ||
| */ | ||
| public static final Predicate<ExchangeInfo> DOES_SUPPORT_SEARCH = it -> ofNullable(it.getArguments() | ||
| .get(ANALYZER_LOG_SEARCH)).map(val -> BooleanUtils.toBoolean(val.toString())).orElse(false); | ||
|
|
||
| /** | ||
| * Checks if service support logs searching. <code>false</code> | ||
| * by default | ||
| */ | ||
| public static final Predicate<ExchangeInfo> DOES_SUPPORT_SUGGEST = it -> ofNullable(it.getArguments() | ||
| .get(ANALYZER_SUGGEST)).map(val -> BooleanUtils.toBoolean(val.toString())).orElse(false); | ||
|
|
||
| /** | ||
| * Checks if service support logs cluster creation. <code>false</code> | ||
| * by default | ||
| */ | ||
| public static final Predicate<ExchangeInfo> DOES_SUPPORT_CLUSTER = it -> ofNullable(it.getArguments() | ||
| .get(ANALYZER_CLUSTER)).map(val -> BooleanUtils.toBoolean(val.toString())).orElse(false); | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.