diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95710e18bb..18cbbb442f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,9 +29,6 @@ env: AUTH0_CLIENT_ID: ${{ secrets.AUTH0_OIDC_ADMIN_CLIENT_ID }} AUTH0_CLIENT_SECRET: ${{ secrets.AUTH0_OIDC_CLIENT_SECRET }} AUTH0_ADMIN_PASSWORD: ${{ secrets.AUTH0_OIDC_ADMIN_PASSWORD }} - # Report Portal settings - RP_LAUNCH_PREFIX: "${{ github.workflow }} - ${{ github.job }}" - RP_PROJECT: alfresco-backend jobs: prepare: @@ -182,52 +179,9 @@ jobs: - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0 - name: "Init" run: bash ./scripts/ci/init.sh - - name: "Prepare Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0 - id: rp-prepare - with: - rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testModule }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - rp-project: ${{ env.RP_PROJECT }} - rp-use-static-launch-name: true - continue-on-error: true - - name: "Add GitHub Step Summary" - if: github.ref_name == 'master' - env: - RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} - RP_KEY: ${{ steps.rp-prepare.outputs.key }} - RP_URL: ${{ steps.rp-prepare.outputs.url }} - run: bash scripts/ci/add_step_summary.sh - continue-on-error: true - name: "Run tests" - id: run-tests - env: - RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | - eval "args=($RP_OPTS)" mvn -B test -pl ${{ matrix.testModule }} -am ${{ matrix.testAttributes }} -DfailIfNoTests=false "${args[@]}" - continue-on-error: true - - name: "Update GitHub Step Summary" - if: github.ref_name == 'master' - run: | - echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY - continue-on-error: true - - name: "Summarize Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.16.0 - id: rp-summarize - with: - tests-outcome: ${{ steps.run-tests.outcome }} - rp-launch-key: ${{ steps.rp-prepare.outputs.key }} - rp-project: ${{ env.RP_PROJECT }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - continue-on-error: true - - name: "Exit on failure" - if: steps.run-tests.outcome != 'success' - run: | - echo "::error title=run-tests::Tests failed: re-throwing on error." - exit 1 - name: "Clean Maven cache" run: bash ./scripts/ci/cleanup_cache.sh @@ -270,52 +224,8 @@ jobs: - name: "Set up the environment" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d - - name: "Prepare Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0 - id: rp-prepare - with: - rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testSuite }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - rp-project: ${{ env.RP_PROJECT }} - rp-use-static-launch-name: true - continue-on-error: true - - name: "Add GitHub Step Summary" - if: github.ref_name == 'master' - env: - RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} - RP_KEY: ${{ steps.rp-prepare.outputs.key }} - RP_URL: ${{ steps.rp-prepare.outputs.url }} - run: bash scripts/ci/add_step_summary.sh - continue-on-error: true - name: "Run tests" - id: run-tests - env: - RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} - run: | - eval "args=($RP_OPTS)" - mvn -B test -pl remote-api -Dtest=${{ matrix.testSuite }} -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}" - continue-on-error: true - - name: "Update GitHub Step Summary" - if: github.ref_name == 'master' - run: | - echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY - continue-on-error: true - - name: "Summarize Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.16.0 - id: rp-summarize - with: - tests-outcome: ${{ steps.run-tests.outcome }} - rp-launch-key: ${{ steps.rp-prepare.outputs.key }} - rp-project: ${{ env.RP_PROJECT }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - continue-on-error: true - - name: "Exit on failure" - if: steps.run-tests.outcome != 'success' - run: | - echo "::error title=run-tests::Tests failed: re-throwing on error." - exit 1 + run: mvn -B test -pl remote-api -Dtest=${{ matrix.testSuite }} -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco # pragma: allowlist secret - name: "Clean Maven cache" run: bash ./scripts/ci/cleanup_cache.sh @@ -345,52 +255,8 @@ jobs: run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mariadb up -d env: MARIADB_VERSION: ${{ matrix.version }} - - name: "Prepare Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0 - id: rp-prepare - with: - rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.version }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - rp-project: ${{ env.RP_PROJECT }} - rp-use-static-launch-name: true - continue-on-error: true - - name: "Add GitHub Step Summary" - if: github.ref_name == 'master' - env: - RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} - RP_KEY: ${{ steps.rp-prepare.outputs.key }} - RP_URL: ${{ steps.rp-prepare.outputs.url }} - run: bash scripts/ci/add_step_summary.sh - continue-on-error: true - name: "Run tests" - id: run-tests - env: - RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} - run: | - eval "args=($RP_OPTS)" - mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver "${args[@]}" - continue-on-error: true - - name: "Update GitHub Step Summary" - if: github.ref_name == 'master' - run: | - echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY - continue-on-error: true - - name: "Summarize Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.16.0 - id: rp-summarize - with: - tests-outcome: ${{ steps.run-tests.outcome }} - rp-launch-key: ${{ steps.rp-prepare.outputs.key }} - rp-project: ${{ env.RP_PROJECT }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - continue-on-error: true - - name: "Exit on failure" - if: steps.run-tests.outcome != 'success' - run: | - echo "::error title=run-tests::Tests failed: re-throwing on error." - exit 1 + run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver # pragma: allowlist secret - name: "Clean Maven cache" run: bash ./scripts/ci/cleanup_cache.sh @@ -416,52 +282,8 @@ jobs: run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mariadb up -d env: MARIADB_VERSION: 10.11 - - name: "Prepare Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0 - id: rp-prepare - with: - rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - rp-project: ${{ env.RP_PROJECT }} - rp-use-static-launch-name: true - continue-on-error: true - - name: "Add GitHub Step Summary" - if: github.ref_name == 'master' - env: - RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} - RP_KEY: ${{ steps.rp-prepare.outputs.key }} - RP_URL: ${{ steps.rp-prepare.outputs.url }} - run: bash scripts/ci/add_step_summary.sh - continue-on-error: true - name: "Run tests" - id: run-tests - env: - RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} - run: | - eval "args=($RP_OPTS)" - mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver "${args[@]}" - continue-on-error: true - - name: "Update GitHub Step Summary" - if: github.ref_name == 'master' - run: | - echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY - continue-on-error: true - - name: "Summarize Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.16.0 - id: rp-summarize - with: - tests-outcome: ${{ steps.run-tests.outcome }} - rp-launch-key: ${{ steps.rp-prepare.outputs.key }} - rp-project: ${{ env.RP_PROJECT }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - continue-on-error: true - - name: "Exit on failure" - if: steps.run-tests.outcome != 'success' - run: | - echo "::error title=run-tests::Tests failed: re-throwing on error." - exit 1 + run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver # pragma: allowlist secret - name: "Clean Maven cache" run: bash ./scripts/ci/cleanup_cache.sh @@ -487,52 +309,8 @@ jobs: run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mysql up -d env: MYSQL_VERSION: 8 - - name: "Prepare Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0 - id: rp-prepare - with: - rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - rp-project: ${{ env.RP_PROJECT }} - rp-use-static-launch-name: true - continue-on-error: true - - name: "Add GitHub Step Summary" - if: github.ref_name == 'master' - env: - RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} - RP_KEY: ${{ steps.rp-prepare.outputs.key }} - RP_URL: ${{ steps.rp-prepare.outputs.url }} - run: bash scripts/ci/add_step_summary.sh - continue-on-error: true - name: "Run tests" - id: run-tests - env: - RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} - run: | - eval "args=($RP_OPTS)" - mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=com.mysql.cj.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}" - continue-on-error: true - - name: "Update GitHub Step Summary" - if: github.ref_name == 'master' - run: | - echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY - continue-on-error: true - - name: "Summarize Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.16.0 - id: rp-summarize - with: - tests-outcome: ${{ steps.run-tests.outcome }} - rp-launch-key: ${{ steps.rp-prepare.outputs.key }} - rp-project: ${{ env.RP_PROJECT }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - continue-on-error: true - - name: "Exit on failure" - if: steps.run-tests.outcome != 'success' - run: | - echo "::error title=run-tests::Tests failed: re-throwing on error." - exit 1 + run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco # pragma: allowlist secret - name: "Clean Maven cache" run: bash ./scripts/ci/cleanup_cache.sh @@ -557,52 +335,8 @@ jobs: run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d env: POSTGRES_VERSION: 14.15 - - name: "Prepare Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0 - id: rp-prepare - with: - rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - rp-project: ${{ env.RP_PROJECT }} - rp-use-static-launch-name: true - continue-on-error: true - - name: "Add GitHub Step Summary" - if: github.ref_name == 'master' - env: - RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} - RP_KEY: ${{ steps.rp-prepare.outputs.key }} - RP_URL: ${{ steps.rp-prepare.outputs.url }} - run: bash scripts/ci/add_step_summary.sh - continue-on-error: true - name: "Run tests" - id: run-tests - env: - RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} - run: | - eval "args=($RP_OPTS)" - mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}" - continue-on-error: true - - name: "Update GitHub Step Summary" - if: github.ref_name == 'master' - run: | - echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY - continue-on-error: true - - name: "Summarize Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.16.0 - id: rp-summarize - with: - tests-outcome: ${{ steps.run-tests.outcome }} - rp-launch-key: ${{ steps.rp-prepare.outputs.key }} - rp-project: ${{ env.RP_PROJECT }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - continue-on-error: true - - name: "Exit on failure" - if: steps.run-tests.outcome != 'success' - run: | - echo "::error title=run-tests::Tests failed: re-throwing on error." - exit 1 + run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco # pragma: allowlist secret - name: "Clean Maven cache" run: bash ./scripts/ci/cleanup_cache.sh @@ -627,52 +361,8 @@ jobs: run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d env: POSTGRES_VERSION: 15.10 - - name: "Prepare Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0 - id: rp-prepare - with: - rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - rp-project: ${{ env.RP_PROJECT }} - rp-use-static-launch-name: true - continue-on-error: true - - name: "Add GitHub Step Summary" - if: github.ref_name == 'master' - env: - RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} - RP_KEY: ${{ steps.rp-prepare.outputs.key }} - RP_URL: ${{ steps.rp-prepare.outputs.url }} - run: bash scripts/ci/add_step_summary.sh - continue-on-error: true - name: "Run tests" - id: run-tests - env: - RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} - run: | - eval "args=($RP_OPTS)" - mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}" - continue-on-error: true - - name: "Update GitHub Step Summary" - if: github.ref_name == 'master' - run: | - echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY - continue-on-error: true - - name: "Summarize Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.16.0 - id: rp-summarize - with: - tests-outcome: ${{ steps.run-tests.outcome }} - rp-launch-key: ${{ steps.rp-prepare.outputs.key }} - rp-project: ${{ env.RP_PROJECT }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - continue-on-error: true - - name: "Exit on failure" - if: steps.run-tests.outcome != 'success' - run: | - echo "::error title=run-tests::Tests failed: re-throwing on error." - exit 1 + run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco # pragma: allowlist secret - name: "Clean Maven cache" run: bash ./scripts/ci/cleanup_cache.sh @@ -697,52 +387,8 @@ jobs: run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d env: POSTGRES_VERSION: 16.6 - - name: "Prepare Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0 - id: rp-prepare - with: - rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - rp-project: ${{ env.RP_PROJECT }} - rp-use-static-launch-name: true - continue-on-error: true - - name: "Add GitHub Step Summary" - if: github.ref_name == 'master' - env: - RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} - RP_KEY: ${{ steps.rp-prepare.outputs.key }} - RP_URL: ${{ steps.rp-prepare.outputs.url }} - run: bash scripts/ci/add_step_summary.sh - continue-on-error: true - name: "Run tests" - id: run-tests - env: - RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} - run: | - eval "args=($RP_OPTS)" - mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}" - continue-on-error: true - - name: "Update GitHub Step Summary" - if: github.ref_name == 'master' - run: | - echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY - continue-on-error: true - - name: "Summarize Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.16.0 - id: rp-summarize - with: - tests-outcome: ${{ steps.run-tests.outcome }} - rp-launch-key: ${{ steps.rp-prepare.outputs.key }} - rp-project: ${{ env.RP_PROJECT }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - continue-on-error: true - - name: "Exit on failure" - if: steps.run-tests.outcome != 'success' - run: | - echo "::error title=run-tests::Tests failed: re-throwing on error." - exit 1 + run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco # pragma: allowlist secret - name: "Clean Maven cache" run: bash ./scripts/ci/cleanup_cache.sh @@ -763,52 +409,8 @@ jobs: run: bash ./scripts/ci/init.sh - name: "Run ActiveMQ" run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile activemq up -d - - name: "Prepare Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0 - id: rp-prepare - with: - rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - rp-project: ${{ env.RP_PROJECT }} - rp-use-static-launch-name: true - continue-on-error: true - - name: "Add GitHub Step Summary" - if: github.ref_name == 'master' - env: - RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} - RP_KEY: ${{ steps.rp-prepare.outputs.key }} - RP_URL: ${{ steps.rp-prepare.outputs.url }} - run: bash scripts/ci/add_step_summary.sh - continue-on-error: true - name: "Run tests" - id: run-tests - env: - RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} - run: | - eval "args=($RP_OPTS)" - mvn -B test -pl repository -am -Dtest=MessagingUnitTestSuite -DfailIfNoTests=false "${args[@]}" - continue-on-error: true - - name: "Update GitHub Step Summary" - if: github.ref_name == 'master' - run: | - echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY - continue-on-error: true - - name: "Summarize Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.16.0 - id: rp-summarize - with: - tests-outcome: ${{ steps.run-tests.outcome }} - rp-launch-key: ${{ steps.rp-prepare.outputs.key }} - rp-project: ${{ env.RP_PROJECT }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - continue-on-error: true - - name: "Exit on failure" - if: steps.run-tests.outcome != 'success' - run: | - echo "::error title=run-tests::Tests failed: re-throwing on error." - exit 1 + run: mvn -B test -pl repository -am -Dtest=CamelRoutesTest,CamelComponentsTest -DfailIfNoTests=false # pragma: allowlist secret - name: "Clean Maven cache" run: bash ./scripts/ci/cleanup_cache.sh @@ -879,52 +481,8 @@ jobs: - name: "Set up the environment" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d - - name: "Prepare Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0 - id: rp-prepare - with: - rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testSuite }} ${{ matrix.idp }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - rp-project: ${{ env.RP_PROJECT }} - rp-use-static-launch-name: true - continue-on-error: true - - name: "Add GitHub Step Summary" - if: github.ref_name == 'master' - env: - RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} - RP_KEY: ${{ steps.rp-prepare.outputs.key }} - RP_URL: ${{ steps.rp-prepare.outputs.url }} - run: bash scripts/ci/add_step_summary.sh - continue-on-error: true - name: "Run tests" - id: run-tests - env: - RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} - run: | - eval "args=($RP_OPTS)" - mvn -B test -pl repository -am -Dtest=${{ matrix.testSuite }} -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco ${{ matrix.mvn-options }} "${args[@]}" - continue-on-error: true - - name: "Update GitHub Step Summary" - if: github.ref_name == 'master' - run: | - echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY - continue-on-error: true - - name: "Summarize Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.16.0 - id: rp-summarize - with: - tests-outcome: ${{ steps.run-tests.outcome }} - rp-launch-key: ${{ steps.rp-prepare.outputs.key }} - rp-project: ${{ env.RP_PROJECT }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - continue-on-error: true - - name: "Exit on failure" - if: steps.run-tests.outcome != 'success' - run: | - echo "::error title=run-tests::Tests failed: re-throwing on error." - exit 1 + run: mvn -B test -pl repository -am -Dtest=${{ matrix.testSuite }} -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco ${{ matrix.mvn-options }} # pragma: allowlist secret - name: "Clean Maven cache" run: bash ./scripts/ci/cleanup_cache.sh @@ -986,59 +544,16 @@ jobs: - name: "Build TAS integration tests" if: ${{ matrix.test-name }} == 'Integration TAS tests' run: mvn install -pl :alfresco-community-repo-integration-test -am -DskipTests -Pall-tas-tests - - name: "Prepare Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0 - id: rp-prepare - with: - rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.test-name }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - rp-project: ${{ env.RP_PROJECT }} - rp-use-static-launch-name: true - continue-on-error: true - - name: "Add GitHub Step Summary" - if: github.ref_name == 'master' - env: - RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} - RP_KEY: ${{ steps.rp-prepare.outputs.key }} - RP_URL: ${{ steps.rp-prepare.outputs.url }} - run: bash scripts/ci/add_step_summary.sh - continue-on-error: true - name: "Run tests" id: tests - env: - RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} - run: | - eval "args=($RP_OPTS)" - mvn -B verify -f packaging/tests/${{ matrix.pom-dir }}/pom.xml -Pall-tas-tests,${{ matrix.test-profile }} -Denvironment=default -DrunBugs=false "${args[@]}" - continue-on-error: true + run: mvn -B verify -f packaging/tests/${{ matrix.pom-dir }}/pom.xml -Pall-tas-tests,${{ matrix.test-profile }} -Denvironment=default -DrunBugs=false - name: "Print output after success" if: ${{ always() && steps.tests.outcome == 'success' }} run: ${TAS_SCRIPTS}/output_tests_run.sh "packaging/tests/${{ matrix.pom-dir }}" - name: "Print output after failure" if: ${{ always() && steps.tests.outcome == 'failure' }} run: ${TAS_SCRIPTS}/output_logs_for_failures.sh "packaging/tests/${{ matrix.pom-dir }}" - - name: "Update GitHub Step Summary" - if: github.ref_name == 'master' - run: | - echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY - continue-on-error: true - - name: "Summarize Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.16.0 - id: rp-summarize - with: - tests-outcome: ${{ steps.tests.outcome }} - rp-launch-key: ${{ steps.rp-prepare.outputs.key }} - rp-project: ${{ env.RP_PROJECT }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - continue-on-error: true - - name: "Exit on failure" - if: steps.tests.outcome != 'success' - run: | - echo "::error title=tests::Tests failed: re-throwing on error." - exit 1 - name: "Clean Maven cache" run: bash ./scripts/ci/cleanup_cache.sh @@ -1059,52 +574,8 @@ jobs: run: bash ./scripts/ci/init.sh - name: "Run Postgres 16.6 database" run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile postgres up -d - - name: "Prepare Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0 - id: rp-prepare - with: - rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - rp-project: ${{ env.RP_PROJECT }} - rp-use-static-launch-name: true - continue-on-error: true - - name: "Add GitHub Step Summary" - if: github.ref_name == 'master' - env: - RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} - RP_KEY: ${{ steps.rp-prepare.outputs.key }} - RP_URL: ${{ steps.rp-prepare.outputs.url }} - run: bash scripts/ci/add_step_summary.sh - continue-on-error: true - name: "Run tests" - id: run-tests - env: - RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} - run: | - eval "args=($RP_OPTS)" - mvn -B test -pl :alfresco-share-services -am -Dtest=ShareServicesTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}" - continue-on-error: true - - name: "Update GitHub Step Summary" - if: github.ref_name == 'master' - run: | - echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY - continue-on-error: true - - name: "Summarize Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.16.0 - id: rp-summarize - with: - tests-outcome: ${{ steps.run-tests.outcome }} - rp-launch-key: ${{ steps.rp-prepare.outputs.key }} - rp-project: ${{ env.RP_PROJECT }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - continue-on-error: true - - name: "Exit on failure" - if: steps.run-tests.outcome != 'success' - run: | - echo "::error title=run-tests::Tests failed: re-throwing on error." - exit 1 + run: mvn -B test -pl :alfresco-share-services -am -Dtest=ShareServicesTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco # pragma: allowlist secret - name: "Clean Maven cache" run: bash ./scripts/ci/cleanup_cache.sh @@ -1134,23 +605,9 @@ jobs: run: | bash ./scripts/ci/init.sh bash ./scripts/ci/build.sh - - name: "Prepare Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0 - id: rp-prepare - with: - rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} 0${{ matrix.part }} - (PostgreSQL) ${{ matrix.test-name }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - rp-project: ${{ env.RP_PROJECT }} - rp-use-static-launch-name: true - continue-on-error: true - name: "Verify" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} - env: - RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} - run: | - eval "args=($RP_OPTS)" - mvn --file amps/ags/pom.xml -B verify -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-postgres -PagsAllTestSuitePt${{ matrix.part }} ${{ env.LOG_WARN }} "${args[@]}" + run: mvn --file amps/ags/pom.xml -B verify -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-postgres -PagsAllTestSuitePt${{ matrix.part }} ${{ env.LOG_WARN }} - name: "Clean Maven cache" run: bash ./scripts/ci/cleanup_cache.sh @@ -1180,23 +637,9 @@ jobs: run: | bash ./scripts/ci/init.sh bash ./scripts/ci/build.sh - - name: "Prepare Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0 - id: rp-prepare - with: - rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} 0${{ matrix.part }} - (MySQL) ${{ matrix.test-name }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - rp-project: ${{ env.RP_PROJECT }} - rp-use-static-launch-name: true - continue-on-error: true - name: "Verify" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} - env: - RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} - run: | - eval "args=($RP_OPTS)" - mvn --file amps/ags/pom.xml -B verify -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-mysql -PagsAllTestSuitePt${{ matrix.part }} ${{ env.LOG_WARN }} "${args[@]}" + run: mvn --file amps/ags/pom.xml -B verify -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-mysql -PagsAllTestSuitePt${{ matrix.part }} ${{ env.LOG_WARN }} - name: "Clean Maven cache" run: bash ./scripts/ci/cleanup_cache.sh @@ -1228,53 +671,9 @@ jobs: ${{ env.TAS_SCRIPTS }}/start-compose.sh ./amps/ags/rm-community/rm-community-repo/docker-compose.yml ${{ env.TAS_SCRIPTS }}/wait-for-alfresco-start.sh "http://localhost:8080/alfresco" mvn -B install -pl :alfresco-governance-services-automation-community-rest-api -am -Pags -Pall-tas-tests -DskipTests - - name: "Prepare Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0 - id: rp-prepare - with: - rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - rp-project: ${{ env.RP_PROJECT }} - rp-use-static-launch-name: true - continue-on-error: true - - name: "Add GitHub Step Summary" - if: github.ref_name == 'master' - env: - RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} - RP_KEY: ${{ steps.rp-prepare.outputs.key }} - RP_URL: ${{ steps.rp-prepare.outputs.url }} - run: bash scripts/ci/add_step_summary.sh - continue-on-error: true - name: "Test" - id: run-tests timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} - env: - RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} - run: | - eval "args=($RP_OPTS)" - mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false -Pags -Pall-tas-tests "${args[@]}" - continue-on-error: true - - name: "Update GitHub Step Summary" - if: github.ref_name == 'master' - run: | - echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY - continue-on-error: true - - name: "Summarize Report Portal" - if: github.ref_name == 'master' - uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.16.0 - id: rp-summarize - with: - tests-outcome: ${{ steps.run-tests.outcome }} - rp-launch-key: ${{ steps.rp-prepare.outputs.key }} - rp-project: ${{ env.RP_PROJECT }} - rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} - continue-on-error: true - - name: "Exit on failure" - if: steps.run-tests.outcome != 'success' - run: | - echo "::error title=run-tests::Tests failed: re-throwing on error." - exit 1 + run: mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false -Pags -Pall-tas-tests - name: "Configure AWS credentials" if: ${{ always() }} uses: aws-actions/configure-aws-credentials@v4 diff --git a/.secrets.baseline b/.secrets.baseline index 9727d8b8b8..c2e187e741 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -127,29 +127,6 @@ } ], "results": { - ".github/workflows/ci.yml": [ - { - "type": "Secret Keyword", - "filename": ".github/workflows/ci.yml", - "hashed_secret": "b86dc2f033a63f2b7b9e7d270ab806d2910d7572", - "is_verified": false, - "line_number": 295 - }, - { - "type": "Secret Keyword", - "filename": ".github/workflows/ci.yml", - "hashed_secret": "1bfb0e20f886150ba59b853bcd49dea893e00966", - "is_verified": false, - "line_number": 370 - }, - { - "type": "Secret Keyword", - "filename": ".github/workflows/ci.yml", - "hashed_secret": "128f14373ccfaff49e3664045d3a11b50cbb7b39", - "is_verified": false, - "line_number": 904 - } - ], ".github/workflows/master_release.yml": [ { "type": "Secret Keyword", @@ -1868,5 +1845,5 @@ } ] }, - "generated_at": "2025-04-22T06:32:47Z" + "generated_at": "2025-06-09T16:43:14Z" } diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index 942e7930a0..b178a58601 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml @@ -74,16 +74,6 @@ alfresco-testng 1.1 - - com.epam.reportportal - agent-java-testng - test - - - com.squareup.okhttp3 - okhttp - test - org.awaitility awaitility diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/resources/META-INF/services/org.testng.ITestNGListener b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/resources/META-INF/services/org.testng.ITestNGListener deleted file mode 100644 index f335f0c13f..0000000000 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/resources/META-INF/services/org.testng.ITestNGListener +++ /dev/null @@ -1 +0,0 @@ -com.epam.reportportal.testng.ReportPortalTestNGListener diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 0683e30d5f..6ee3f06f1c 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -84,11 +84,6 @@ junit test - - com.epam.reportportal - agent-java-testng - test - org.postgresql postgresql diff --git a/amps/ags/rm-community/rm-community-repo/test/resources/META-INF/services/org.testng.ITestNGListener b/amps/ags/rm-community/rm-community-repo/test/resources/META-INF/services/org.testng.ITestNGListener deleted file mode 100644 index f335f0c13f..0000000000 --- a/amps/ags/rm-community/rm-community-repo/test/resources/META-INF/services/org.testng.ITestNGListener +++ /dev/null @@ -1 +0,0 @@ -com.epam.reportportal.testng.ReportPortalTestNGListener diff --git a/amps/ags/rm-community/rm-community-repo/unit-test/resources/META-INF/services/org.testng.ITestNGListener b/amps/ags/rm-community/rm-community-repo/unit-test/resources/META-INF/services/org.testng.ITestNGListener deleted file mode 100644 index f335f0c13f..0000000000 --- a/amps/ags/rm-community/rm-community-repo/unit-test/resources/META-INF/services/org.testng.ITestNGListener +++ /dev/null @@ -1 +0,0 @@ -com.epam.reportportal.testng.ReportPortalTestNGListener diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index ad4d73e193..4785126ce1 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -70,11 +70,6 @@ junit test - - com.epam.reportportal - agent-java-testng - test - org.postgresql postgresql diff --git a/amps/share-services/src/test/resources/META-INF/services/org.testng.ITestNGListener b/amps/share-services/src/test/resources/META-INF/services/org.testng.ITestNGListener deleted file mode 100644 index f335f0c13f..0000000000 --- a/amps/share-services/src/test/resources/META-INF/services/org.testng.ITestNGListener +++ /dev/null @@ -1 +0,0 @@ -com.epam.reportportal.testng.ReportPortalTestNGListener diff --git a/core/pom.xml b/core/pom.xml index 10352e67d8..79a1b44356 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -126,11 +126,6 @@ junit test - - com.epam.reportportal - agent-java-testng - test - org.mockito mockito-core diff --git a/core/src/test/resources/META-INF/services/org.testng.ITestNGListener b/core/src/test/resources/META-INF/services/org.testng.ITestNGListener deleted file mode 100644 index f335f0c13f..0000000000 --- a/core/src/test/resources/META-INF/services/org.testng.ITestNGListener +++ /dev/null @@ -1 +0,0 @@ -com.epam.reportportal.testng.ReportPortalTestNGListener diff --git a/data-model/pom.xml b/data-model/pom.xml index 1ffd217da6..804870e72e 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -247,11 +247,6 @@ junit test - - com.epam.reportportal - agent-java-testng - test - org.antlr gunit diff --git a/data-model/src/test/resources/META-INF/services/org.testng.ITestNGListener b/data-model/src/test/resources/META-INF/services/org.testng.ITestNGListener deleted file mode 100644 index f335f0c13f..0000000000 --- a/data-model/src/test/resources/META-INF/services/org.testng.ITestNGListener +++ /dev/null @@ -1 +0,0 @@ -com.epam.reportportal.testng.ReportPortalTestNGListener diff --git a/mmt/pom.xml b/mmt/pom.xml index b0a6f3f1b3..6441085507 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -46,11 +46,6 @@ junit test - - com.epam.reportportal - agent-java-testng - test - org.mockito mockito-core diff --git a/mmt/src/test/resources/META-INF/services/org.testng.ITestNGListener b/mmt/src/test/resources/META-INF/services/org.testng.ITestNGListener deleted file mode 100644 index f335f0c13f..0000000000 --- a/mmt/src/test/resources/META-INF/services/org.testng.ITestNGListener +++ /dev/null @@ -1 +0,0 @@ -com.epam.reportportal.testng.ReportPortalTestNGListener diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index b3b4778716..880554af84 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -68,16 +68,6 @@ - - com.epam.reportportal - agent-java-testng - test - - - com.squareup.okhttp3 - okhttp - test - diff --git a/packaging/tests/tas-cmis/src/test/resources/META-INF/services/org.testng.ITestNGListener b/packaging/tests/tas-cmis/src/test/resources/META-INF/services/org.testng.ITestNGListener deleted file mode 100644 index f335f0c13f..0000000000 --- a/packaging/tests/tas-cmis/src/test/resources/META-INF/services/org.testng.ITestNGListener +++ /dev/null @@ -1 +0,0 @@ -com.epam.reportportal.testng.ReportPortalTestNGListener diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 62afd2ea2b..9fbd109b19 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -36,11 +36,6 @@ jakarta.mail-api test - - com.epam.reportportal - agent-java-testng - test - diff --git a/packaging/tests/tas-email/src/test/resources/META-INF/services/org.testng.ITestNGListener b/packaging/tests/tas-email/src/test/resources/META-INF/services/org.testng.ITestNGListener deleted file mode 100644 index f335f0c13f..0000000000 --- a/packaging/tests/tas-email/src/test/resources/META-INF/services/org.testng.ITestNGListener +++ /dev/null @@ -1 +0,0 @@ -com.epam.reportportal.testng.ReportPortalTestNGListener diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 50fe735379..46d436a8a3 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -44,18 +44,6 @@ test - - com.epam.reportportal - agent-java-testng - test - - - - com.squareup.okhttp3 - okhttp - test - - com.sun.mail jakarta.mail diff --git a/packaging/tests/tas-integration/src/test/resources/META-INF/services/org.testng.ITestNGListener b/packaging/tests/tas-integration/src/test/resources/META-INF/services/org.testng.ITestNGListener deleted file mode 100644 index f335f0c13f..0000000000 --- a/packaging/tests/tas-integration/src/test/resources/META-INF/services/org.testng.ITestNGListener +++ /dev/null @@ -1 +0,0 @@ -com.epam.reportportal.testng.ReportPortalTestNGListener diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 33742b7649..51380a9a24 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -79,18 +79,6 @@ ${commons-lang3.version} - - com.epam.reportportal - agent-java-testng - test - - - - com.squareup.okhttp3 - okhttp - test - - org.awaitility awaitility diff --git a/packaging/tests/tas-restapi/src/test/resources/META-INF/services/org.testng.ITestNGListener b/packaging/tests/tas-restapi/src/test/resources/META-INF/services/org.testng.ITestNGListener deleted file mode 100644 index f335f0c13f..0000000000 --- a/packaging/tests/tas-restapi/src/test/resources/META-INF/services/org.testng.ITestNGListener +++ /dev/null @@ -1 +0,0 @@ -com.epam.reportportal.testng.ReportPortalTestNGListener diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 14dbaee77c..c295769d45 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -31,11 +31,6 @@ webdav test - - com.epam.reportportal - agent-java-testng - test - diff --git a/packaging/tests/tas-webdav/src/test/resources/META-INF/services/org.testng.ITestNGListener b/packaging/tests/tas-webdav/src/test/resources/META-INF/services/org.testng.ITestNGListener deleted file mode 100644 index f335f0c13f..0000000000 --- a/packaging/tests/tas-webdav/src/test/resources/META-INF/services/org.testng.ITestNGListener +++ /dev/null @@ -1 +0,0 @@ -com.epam.reportportal.testng.ReportPortalTestNGListener diff --git a/pom.xml b/pom.xml index 073919ebbb..93d00ad829 100644 --- a/pom.xml +++ b/pom.xml @@ -828,18 +828,6 @@ 4.13.2 test - - com.epam.reportportal - agent-java-testng - 5.4.0 - test - - - com.squareup.okhttp3 - okhttp - 4.12.0 - test - org.antlr gunit diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 67b162c25a..e153223333 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -66,11 +66,6 @@ junit test - - com.epam.reportportal - agent-java-testng - test - org.mockito mockito-core diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/MoveMethodTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/MoveMethodTest.java index 451471ec8b..aaf8aa0ca9 100644 --- a/remote-api/src/test/java/org/alfresco/repo/webdav/MoveMethodTest.java +++ b/remote-api/src/test/java/org/alfresco/repo/webdav/MoveMethodTest.java @@ -29,6 +29,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -203,8 +204,8 @@ public class MoveMethodTest @Test public void canRenameFoldersWhenNewNameMatchesShufflePattern() throws Exception { - when(davHelper.isRenameShuffle(destPath)).thenReturn(true); - when(davHelper.isRenameShuffle(sourcePath)).thenReturn(false); + lenient().when(davHelper.isRenameShuffle(destPath)).thenReturn(true); + lenient().when(davHelper.isRenameShuffle(sourcePath)).thenReturn(false); // Test: Perform the rename moveMethod.moveOrCopy(sourceNodeRef, sourceParentNodeRef, destParentNodeRef, "dest.doc"); @@ -247,8 +248,8 @@ public class MoveMethodTest sourcePath = "/path/from/test.doc"; moveMethod.m_strPath = sourcePath; - when(davHelper.getServiceRegistry()).thenReturn(mockServiceRegistry); - when(mockServiceRegistry.getContentService()).thenReturn(mockContentService); + lenient().when(davHelper.getServiceRegistry()).thenReturn(mockServiceRegistry); + lenient().when(mockServiceRegistry.getContentService()).thenReturn(mockContentService); List sourcePathSplit = Arrays.asList("path", "from", "test.doc"); when(davHelper.splitAllPaths(sourcePath)).thenReturn(sourcePathSplit); @@ -366,7 +367,7 @@ public class MoveMethodTest when(mockFileFolderService.resolveNamePath(rootNode, sourcePathSplit)).thenReturn(tmpFI); when(davHelper.isRenameShuffle(destPath)).thenReturn(false); - when(davHelper.isRenameShuffle(sourcePath)).thenReturn(true); + lenient().when(davHelper.isRenameShuffle(sourcePath)).thenReturn(true); moveMethod.moveOrCopy(atmpFI.getNodeRef(), companyHomeNodeRef, companyHomeNodeRef, bakFileName); diff --git a/remote-api/src/test/resources/META-INF/services/org.testng.ITestNGListener b/remote-api/src/test/resources/META-INF/services/org.testng.ITestNGListener deleted file mode 100644 index f335f0c13f..0000000000 --- a/remote-api/src/test/resources/META-INF/services/org.testng.ITestNGListener +++ /dev/null @@ -1 +0,0 @@ -com.epam.reportportal.testng.ReportPortalTestNGListener diff --git a/repository/pom.xml b/repository/pom.xml index ec079603c8..75bb26e061 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -627,11 +627,6 @@ junit test - - com.epam.reportportal - agent-java-testng - test - org.assertj assertj-core diff --git a/repository/src/test/java/org/alfresco/repo/bootstrap/DataDictionaryFolderTest.java b/repository/src/test/java/org/alfresco/repo/bootstrap/DataDictionaryFolderTest.java index a418fd20bd..be1bcb1874 100644 --- a/repository/src/test/java/org/alfresco/repo/bootstrap/DataDictionaryFolderTest.java +++ b/repository/src/test/java/org/alfresco/repo/bootstrap/DataDictionaryFolderTest.java @@ -46,12 +46,12 @@ import org.alfresco.util.test.junitrules.WellKnownNodes; public class DataDictionaryFolderTest extends BaseSpringTest { @ClassRule - private static final ApplicationContextInit APP_CONTEXT_INIT = new ApplicationContextInit(); + public static final ApplicationContextInit APP_CONTEXT_INIT = new ApplicationContextInit(); private static final String DATA_DICTIONARY = "Data Dictionary"; @Rule - private WellKnownNodes wellKnownNodes = new WellKnownNodes(APP_CONTEXT_INIT); + public WellKnownNodes wellKnownNodes = new WellKnownNodes(APP_CONTEXT_INIT); private NodeService nodeService; diff --git a/repository/src/test/java/org/alfresco/repo/cache/lookup/EntityLookupCacheTest.java b/repository/src/test/java/org/alfresco/repo/cache/lookup/EntityLookupCacheTest.java index dadd1d87b3..a1429e386c 100644 --- a/repository/src/test/java/org/alfresco/repo/cache/lookup/EntityLookupCacheTest.java +++ b/repository/src/test/java/org/alfresco/repo/cache/lookup/EntityLookupCacheTest.java @@ -31,7 +31,6 @@ import java.sql.Savepoint; import java.util.Map; import java.util.TreeMap; -import junit.framework.AssertionFailedError; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -61,7 +60,7 @@ public class EntityLookupCacheTest implements EntityLookupCallbackDAO(); entityLookupCacheA = new EntityLookupCache(cache, "A", this); @@ -72,18 +71,10 @@ public class EntityLookupCacheTest implements EntityLookupCallbackDAO> $GITHUB_STEP_SUMMARY -echo "#### ⚙ Configuration" >> $GITHUB_STEP_SUMMARY - -if [[ "$RP_ENABLED" == 'true' ]]; then - echo "- [Report Portal]($RP_URL) configured with key "'`'$RP_KEY'`' >> $GITHUB_STEP_SUMMARY -else - echo "- Report Portal not enabled" >> $GITHUB_STEP_SUMMARY -fi - -set +vex -echo "=========================== Finishing Add Step Summary Script =========================="