From be54b9cd9019f3306735487ae1e0bdf51e5a0ce6 Mon Sep 17 00:00:00 2001 From: KryukovaPolina <32718724+KryukovaPolina@users.noreply.github.com> Date: Thu, 14 May 2026 12:55:35 +0300 Subject: [PATCH 1/5] feat: add allure report to rabbit --- .github/workflows/rabbitmq.yaml | 14 ++++++++++++++ ...yml => rabbitmq_clean_sc_monitoring_allure.yml} | 0 workflow-config/rabbitmq_nightly.yaml | 3 ++- 3 files changed, 16 insertions(+), 1 deletion(-) rename templates/rabbitmq-service/{rabbitmq_clean_sc_full_at.yml => rabbitmq_clean_sc_monitoring_allure.yml} (100%) diff --git a/.github/workflows/rabbitmq.yaml b/.github/workflows/rabbitmq.yaml index b59256f5..3e700e6c 100644 --- a/.github/workflows/rabbitmq.yaml +++ b/.github/workflows/rabbitmq.yaml @@ -251,6 +251,20 @@ jobs: # --value="${{ steps.create_bucket.outputs.bucket_name }}" # == End ======= Specific steps for S3 ======= + # == Start ======= Specific steps for Allure report ======= + - name: Add s3 backet for Allure report + if: matrix.test.allure == true + run: >- + python qubership-test-pipelines/scripts/update_yaml.py + --file='qubership-test-pipelines/${{ matrix.test.template }}' + --path='integrationTests/atpReport/atpStorage/username' + --value='${{secrets.AWS_S3_ACCESS_KEY_ID}}' + && python qubership-test-pipelines/scripts/update_yaml.py + --file='qubership-test-pipelines/${{ matrix.test.template }}' + --path='integrationTests/atpReport/atpStorage/password' + --value='${{secrets.AWS_S3_ACCESS_KEY_SECRET}}' + # == End ======= Specific steps for Allure report ======= + - name: Print install deployment parameters run: cat qubership-test-pipelines/${{ matrix.test.template }} diff --git a/templates/rabbitmq-service/rabbitmq_clean_sc_full_at.yml b/templates/rabbitmq-service/rabbitmq_clean_sc_monitoring_allure.yml similarity index 100% rename from templates/rabbitmq-service/rabbitmq_clean_sc_full_at.yml rename to templates/rabbitmq-service/rabbitmq_clean_sc_monitoring_allure.yml diff --git a/workflow-config/rabbitmq_nightly.yaml b/workflow-config/rabbitmq_nightly.yaml index a3d3b68b..dc73ca4d 100644 --- a/workflow-config/rabbitmq_nightly.yaml +++ b/workflow-config/rabbitmq_nightly.yaml @@ -48,7 +48,8 @@ jobs: - name: Clean [${service_branch}] with full at install_version: ${service_branch} - template: templates/rabbitmq-service/rabbitmq_clean_sc_full_at.yml + template: templates/rabbitmq-service/rabbitmq_clean_sc_monitoring_allure.yml sequence: install artifact_name: Clean_CURRENT_full_at monitoring: true + allure: true From 4e1fa2f9c17d8f18d9c77462dd8485d0132bb864 Mon Sep 17 00:00:00 2001 From: KryukovaPolina <32718724+KryukovaPolina@users.noreply.github.com> Date: Wed, 20 May 2026 09:28:38 +0300 Subject: [PATCH 2/5] feat: rename job --- workflow-config/rabbitmq_nightly.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow-config/rabbitmq_nightly.yaml b/workflow-config/rabbitmq_nightly.yaml index dc73ca4d..9faa87ff 100644 --- a/workflow-config/rabbitmq_nightly.yaml +++ b/workflow-config/rabbitmq_nightly.yaml @@ -46,7 +46,7 @@ jobs: tls: true artifact_name: Clean_CURRENT_S3_DRD_TLS - - name: Clean [${service_branch}] with full at + - name: Clean [${service_branch}] with Monitoring and Allure install_version: ${service_branch} template: templates/rabbitmq-service/rabbitmq_clean_sc_monitoring_allure.yml sequence: install From 874279fd4823dba427f1fabd48da1fabc1aa364a Mon Sep 17 00:00:00 2001 From: KryukovaPolina <32718724+KryukovaPolina@users.noreply.github.com> Date: Wed, 20 May 2026 09:38:31 +0300 Subject: [PATCH 3/5] feat: add atp params --- .../rabbitmq_clean_sc_monitoring_allure.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/templates/rabbitmq-service/rabbitmq_clean_sc_monitoring_allure.yml b/templates/rabbitmq-service/rabbitmq_clean_sc_monitoring_allure.yml index e4d8a9a9..b1455f4b 100644 --- a/templates/rabbitmq-service/rabbitmq_clean_sc_monitoring_allure.yml +++ b/templates/rabbitmq-service/rabbitmq_clean_sc_monitoring_allure.yml @@ -44,3 +44,12 @@ tests: # delete NOTsome_pods_are_not_working_alert after fix waitTestResultOnJob: true prometheusUrl: http://vmsingle-k8s.monitoring:8429 + atpReport: + enabled: true + atpStorage: + provider: aws + serverUrl: s3.amazonaws.com + bucket: qstp-results + region: us-east-1 + username: "" + password: "" From 5f1c21d8cd42ed7d32445235d68071fa90b56a8b Mon Sep 17 00:00:00 2001 From: KryukovaPolina <32718724+KryukovaPolina@users.noreply.github.com> Date: Tue, 26 May 2026 12:13:17 +0300 Subject: [PATCH 4/5] feat: fix add s3 bucket for allure --- .github/workflows/rabbitmq.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rabbitmq.yaml b/.github/workflows/rabbitmq.yaml index 3e700e6c..0d7493a5 100644 --- a/.github/workflows/rabbitmq.yaml +++ b/.github/workflows/rabbitmq.yaml @@ -257,11 +257,11 @@ jobs: run: >- python qubership-test-pipelines/scripts/update_yaml.py --file='qubership-test-pipelines/${{ matrix.test.template }}' - --path='integrationTests/atpReport/atpStorage/username' + --path='tests/atpReport/atpStorage/username' --value='${{secrets.AWS_S3_ACCESS_KEY_ID}}' && python qubership-test-pipelines/scripts/update_yaml.py --file='qubership-test-pipelines/${{ matrix.test.template }}' - --path='integrationTests/atpReport/atpStorage/password' + --path='tests/atpReport/atpStorage/password' --value='${{secrets.AWS_S3_ACCESS_KEY_SECRET}}' # == End ======= Specific steps for Allure report ======= From 29b536307efebc2609f6c800393e5c95f5d63b73 Mon Sep 17 00:00:00 2001 From: KryukovaPolina <32718724+KryukovaPolina@users.noreply.github.com> Date: Tue, 26 May 2026 14:59:28 +0300 Subject: [PATCH 5/5] feat: fix final job --- .github/workflows/rabbitmq.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rabbitmq.yaml b/.github/workflows/rabbitmq.yaml index 0d7493a5..75992703 100644 --- a/.github/workflows/rabbitmq.yaml +++ b/.github/workflows/rabbitmq.yaml @@ -355,7 +355,7 @@ jobs: final-status-check: if: ${{ always() }} - runs-on: ubuntu-latest + runs-on: ${{ inputs.runner_type }} needs: [RabbitMQ-Test-Cases] steps: - name: Checkout pipeline