diff --git a/.github/workflows/e2e-sql.yml b/.github/workflows/e2e-sql.yml deleted file mode 100644 index 907e042f12f..00000000000 --- a/.github/workflows/e2e-sql.yml +++ /dev/null @@ -1,59 +0,0 @@ -name: E2E Tests - -on: - push: - branches: - - master - - release - - v9-migration - pull_request: - branches: - - master - - release - - v9-migration - schedule: - - cron: "0 0 * * *" #end of every day -jobs: - E2E-testing: - runs-on: ubuntu-latest - strategy: - fail-fast: false #ensure both tests run even if one fails - matrix: - browser: [firefox] - tests: [stable, unstable] - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 18 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '11' - - name: Cache Gradle packages - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Update Property File - run: mv src/e2e/resources/test.ci-${{ matrix.browser }}.properties src/e2e/resources/test.properties - - name: Run Solr search service + local Datastore emulator - run: docker-compose up -d - - name: Create Config Files - run: ./gradlew createConfigs testClasses generateTypes - - name: Install Frontend Dependencies - run: npm ci - - name: Build Frontend Bundle - run: npm run build - - name: Start Server - run: | - ./gradlew serverRun & - ./wait-for-server.sh - - name: Start Tests - run: xvfb-run --server-args="-screen 0 1024x768x24" ./gradlew -P${{ matrix.tests }} e2eTestsSql - \ No newline at end of file diff --git a/build.gradle b/build.gradle index d87e517c431..1613ad421a6 100644 --- a/build.gradle +++ b/build.gradle @@ -570,43 +570,6 @@ task e2eTests { e2eTests.dependsOn "e2eTestTry${id}" } -task e2eTestsSql { - description "Runs the E2E test suite and retries failed test up to ${numOfTestRetries} times." - group "Test" -} - -(1..numOfTestRetries + 1).each { id -> - def isFirstTry = id == 1 - def isLastRetry = id == numOfTestRetries + 1 - def runUnstableTests = project.hasProperty('unstable') - def outputFileName = runUnstableTests ? "e2e-sql-unstable-test-try-" : "e2e-test-try-" - - task "e2eSqlTestTry${id}"(type: Test) { - useTestNG() - options.suites isFirstTry - ? (runUnstableTests ? "src/e2e/resources/testng-unstable-e2e-sql.xml" : "src/e2e/resources/testng-e2e-sql.xml") - : file("${buildDir}/reports/${outputFileName}${id - 1}/testng-failed.xml") - options.outputDirectory = file("${buildDir}/reports/${outputFileName}${id}") - options.useDefaultListeners = true - ignoreFailures = !isLastRetry - maxHeapSize = "1g" - reports.html.required = false - reports.junitXml.required = false - jvmArgs "-Xss2m", "-Dfile.encoding=UTF-8" - testLogging { - events "passed" - } - afterTest afterTestClosure - if (isFirstTry) { - afterSuite checkTestNgFailureClosure - } - onlyIf { - isFirstTry || file("${buildDir}/reports/${outputFileName}${id - 1}/testng-failed.xml").exists() - } - } - e2eTestsSql.dependsOn "e2eSqlTestTry${id}" -} - task axeTests { description "Runs the full accessibility test suite and retries failed tests once." group "Test" diff --git a/src/e2e/resources/testng-e2e-sql.xml b/src/e2e/resources/testng-e2e-sql.xml deleted file mode 100644 index 64907a933ff..00000000000 --- a/src/e2e/resources/testng-e2e-sql.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/e2e/resources/testng-unstable-e2e-sql.xml b/src/e2e/resources/testng-unstable-e2e-sql.xml deleted file mode 100644 index 8855681cfed..00000000000 --- a/src/e2e/resources/testng-unstable-e2e-sql.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - -