From 199867abdc3ad6be50e336a4785c2aa0c057c794 Mon Sep 17 00:00:00 2001 From: GuyAfik Date: Sun, 17 Dec 2023 23:12:56 +0200 Subject: [PATCH] update artifacts folders names --- .github/actions/test_summary_upload/action.yml | 4 ++-- .github/workflows/main.yml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/actions/test_summary_upload/action.yml b/.github/actions/test_summary_upload/action.yml index 0be6a37f496..2c28343a965 100644 --- a/.github/actions/test_summary_upload/action.yml +++ b/.github/actions/test_summary_upload/action.yml @@ -30,7 +30,7 @@ runs: if: always() uses: actions/upload-artifact@v3 with: - name: ${{ inputs.artifacts_folder_name }}-artifacts-${{ inputs.python-version }}-group(${{ inputs.group }}) + name: ${{ inputs.artifacts_folder_name }}-artifacts-python-(${{ inputs.python-version }})-group(${{ inputs.group }}) path: | ${{ inputs.artifacts_folder_name }} node_versions_info.json @@ -48,7 +48,7 @@ runs: if: always() run: | if [[ "$PYTEST_EXIT_CODE" -ne 0 ]]; then - echo "There are ${{ inputs.artifacts_folder_name }} that failed, pytest finished with exit code $PYTEST_EXIT_CODE, to see the tests summary refer to https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}?pr=${{ github.event.pull_request.number }}" + echo "There are ${{ inputs.artifacts_folder_name }} that failed, pytest finished with exit code $PYTEST_EXIT_CODE, to see the ${{ inputs.artifacts_folder_name }} summary refer to https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}?pr=${{ github.event.pull_request.number }}" else echo "All ${{ inputs.artifacts_folder_name }} have passed, congratulations!" fi diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6ea908dcb50..3c26e4eafa8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,8 +47,8 @@ jobs: # poetry run pytest --ignore={demisto_sdk/commands/init/templates,demisto_sdk/tests/integration_tests} --store-durations --junitxml=test-results/junit.xml || pytest_exit_code=$ # mv .test_durations test-results/test_durations - mkdir unit-test-results - poetry run pytest -v --ignore={demisto_sdk/commands/init/templates,demisto_sdk/tests/integration_tests,demisto_sdk/commands/content_graph} --cov=demisto_sdk --cov-report=html:unit-test-results/coverage --junitxml=unit-test-results/junit.xml --splits 5 --group ${{ matrix.group }} || pytest_exit_code=$? + mkdir unit-tests + poetry run pytest -v --ignore={demisto_sdk/commands/init/templates,demisto_sdk/tests/integration_tests,demisto_sdk/commands/content_graph} --cov=demisto_sdk --cov-report=html:unit-tests/coverage --junitxml=unit-tests/junit.xml --splits 5 --group ${{ matrix.group }} || pytest_exit_code=$? echo "PYTEST_EXIT_CODE=$pytest_exit_code" >> $GITHUB_ENV kill $node_pid @@ -85,8 +85,8 @@ jobs: run: | source "$(poetry env info --path)/bin/activate" - mkdir integration-test-results - poetry run pytest -v demisto_sdk/tests/integration_tests --cov=demisto_sdk --cov-report=html:integration-test-results/coverage --junitxml=integration-test-results/junit.xml || pytest_exit_code=$? + mkdir integration-tests + poetry run pytest -v demisto_sdk/tests/integration_tests --cov=demisto_sdk --cov-report=html:integration-tests/coverage --junitxml=integration-tests/junit.xml || pytest_exit_code=$? echo "PYTEST_EXIT_CODE=$pytest_exit_code" >> $GITHUB_ENV exit $pytest_exit_code @@ -95,7 +95,7 @@ jobs: uses: ./.github/actions/test_summary_upload with: python-version: ${{ matrix.python-version }} - artifacts_folder_name: integration-test-results + artifacts_folder_name: integration-tests graph-tests: name: Graph Tests / ${{ matrix.python-version }} @@ -121,15 +121,15 @@ jobs: run: | source "$(poetry env info --path)/bin/activate" - mkdir graph-test-results - poetry run pytest -v demisto_sdk/commands/content_graph --cov=demisto_sdk --cov-report=html:graph-test-results/coverage --junitxml=graph-test-results/junit.xml || pytest_exit_code=$? + mkdir graph-tests + poetry run pytest -v demisto_sdk/commands/content_graph --cov=demisto_sdk --cov-report=html:graph-tests/coverage --junitxml=graph-tests/junit.xml || pytest_exit_code=$? echo "PYTEST_EXIT_CODE=$pytest_exit_code" >> $GITHUB_ENV - name: Python ${{ matrix.python-version }} - Test Summary Upload uses: ./.github/actions/test_summary_upload with: python-version: ${{ matrix.python-version }} - artifacts_folder_name: graph-test-results + artifacts_folder_name: graph-tests coverage: needs: [unit-tests, integration-tests, graph-tests]