Refactor integration tests infrastructure

.dockerignore

@@ -40,9 +40,7 @@ cpu.out
 *.log
 
 /gitea
-/gitea-vet
 /debug
-/integrations.test
 
 /bin
 /dist
@@ -54,12 +52,6 @@ cpu.out
 /indexers
 /log
 /tests/integration/gitea-integration-*
-/tests/integration/indexers-*
-/tests/e2e/gitea-e2e-*
-/tests/e2e/indexers-*
-/tests/e2e/reports
-/tests/e2e/test-artifacts
-/tests/e2e/test-snapshots
 /tests/*.ini
 /node_modules
 /yarn.lock

.github/workflows/cache-seeder.yml

@@ -57,7 +57,7 @@ jobs:
         include:
           - { job: lint-backend, tags: "bindata sqlite sqlite_unlock_notify", target: "lint-backend" }
           - { job: lint-go-windows, tags: "bindata sqlite sqlite_unlock_notify", target: "lint-go-windows" }
-          - { job: lint-go-gogit, tags: "bindata sqlite sqlite_unlock_notify gogit", target: "lint-go" }
+          - { job: lint-go-gogit, tags: "bindata gogit sqlite sqlite_unlock_notify", target: "lint-go" }
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0

.github/workflows/part-docker-dryrun.yml

@@ -0,0 +1,35 @@
+# Reusable workflow that performs the container build steps for a single platform.
+# Used by `pull-docker-dryrun.yml` to run builds in parallel per-platform.
+on:
+  workflow_call:
+    inputs:
+      platform:
+        description: 'The target platform(s) to build for (e.g. linux/amd64)'
+        required: true
+        type: string
+
+jobs:
+  build-dryrun:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
+      - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
+      - name: Build rootful image
+        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
+        with:
+          context: .
+          platforms: ${{ inputs.platform }}
+          push: false
+          file: Dockerfile
+          cache-from: type=registry,ref=ghcr.io/go-gitea/gitea:buildcache-rootful
+      - name: Build rootless image
+        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
+        with:
+          context: .
+          platforms: ${{ inputs.platform }}
+          push: false
+          file: Dockerfile.rootless
+          cache-from: type=registry,ref=ghcr.io/go-gitea/gitea:buildcache-rootless

.github/workflows/pull-db-tests.yml

@@ -58,13 +58,12 @@ jobs:
         env:
           TAGS: bindata
       - name: run migration tests
-        run: make test-pgsql-migration
+        run: GITEA_TEST_DATABASE=pgsql make test-migration
       - name: run tests
-        run: make test-pgsql
+        run: GITEA_TEST_DATABASE=pgsql make test-integration
         timeout-minutes: 50
         env:
           TAGS: bindata gogit
-          TEST_TAGS: gogit
           TEST_LDAP: 1
 
   test-sqlite:
@@ -84,18 +83,21 @@ jobs:
         with:
           cache-name: sqlite
       - run: make deps-backend
-      - run: GOEXPERIMENT='' make backend
+      - run: make backend
         env:
           TAGS: bindata gogit sqlite sqlite_unlock_notify
+          GOEXPERIMENT:
       - name: run migration tests
-        run: make test-sqlite-migration
+        run: GITEA_TEST_DATABASE=sqlite make test-migration
+        env:
+          TAGS: bindata gogit
       - name: run tests
-        run: GOEXPERIMENT='' make test-sqlite
+        run: GITEA_TEST_DATABASE=sqlite make test-integration
         timeout-minutes: 50
         env:
-          TAGS: bindata gogit sqlite sqlite_unlock_notify
-          RACE_ENABLED: true
-          TEST_TAGS: gogit sqlite sqlite_unlock_notify
+          TAGS: bindata gogit
+          GOEXPERIMENT:
+          GOTEST_FLAGS: -race -timeout=40m
 
   test-unit:
     if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.actions == 'true'
@@ -156,16 +158,15 @@ jobs:
       - name: unit-tests
         run: make test-backend test-check
         env:
-          TAGS: bindata
-          RACE_ENABLED: true
-          GOTESTFLAGS: -timeout=20m
+          TAGS: bindata sqlite sqlite_unlock_notify
+          GOTEST_FLAGS: -race -timeout=20m
           GITHUB_READ_TOKEN: ${{ secrets.GITHUB_READ_TOKEN }}
       - name: unit-tests-gogit
-        run: GOEXPERIMENT='' make test-backend test-check
+        run: make test-backend test-check
         env:
-          TAGS: bindata gogit
-          RACE_ENABLED: true
-          GOTESTFLAGS: -timeout=20m
+          TAGS: bindata gogit sqlite sqlite_unlock_notify
+          GOEXPERIMENT:
+          GOTEST_FLAGS: -race -timeout=20m
           GITHUB_READ_TOKEN: ${{ secrets.GITHUB_READ_TOKEN }}
 
   test-mysql:
@@ -215,10 +216,9 @@ jobs:
         env:
           TAGS: bindata
       - name: run migration tests
-        run: make test-mysql-migration
+        run: GITEA_TEST_DATABASE=mysql make test-migration
       - name: run tests
-        # run: make integration-test-coverage (at the moment, no coverage is really handled)
-        run: make test-mysql
+        run: GITEA_TEST_DATABASE=mysql make test-integration
         env:
           TAGS: bindata
           TEST_INDEXER_CODE_ES_URL: "http://elastic:changeme@elasticsearch:9200"
@@ -258,9 +258,9 @@ jobs:
       - run: make backend
         env:
           TAGS: bindata
-      - run: make test-mssql-migration
+      - run: GITEA_TEST_DATABASE=mssql make test-migration
       - name: run tests
-        run: make test-mssql
+        run: GITEA_TEST_DATABASE=mssql make test-integration
         timeout-minutes: 50
         env:
           TAGS: bindata

.github/workflows/pull-docker-dryrun.yml

@@ -7,34 +7,33 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   files-changed:
     uses: ./.github/workflows/files-changed.yml
     permissions:
       contents: read
 
-  container:
+  # dryrun build is slow, so run them in parallel per-platform
+  container-amd64:
     if: needs.files-changed.outputs.docker == 'true'
-    needs: files-changed
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
-      - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
-      - name: Build regular container image
-        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64,linux/riscv64
-          push: false
-          cache-from: type=registry,ref=ghcr.io/go-gitea/gitea:buildcache-rootful
-      - name: Build rootless container image
-        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
-        with:
-          context: .
-          push: false
-          platforms: linux/amd64,linux/arm64,linux/riscv64
-          file: Dockerfile.rootless
-          cache-from: type=registry,ref=ghcr.io/go-gitea/gitea:buildcache-rootless
+    needs: [files-changed]
+    uses: ./.github/workflows/part-docker-dryrun.yml
+    with:
+      platform: linux/amd64
+
+  container-arm64:
+    if: needs.files-changed.outputs.docker == 'true'
+    needs: [files-changed]
+    uses: ./.github/workflows/part-docker-dryrun.yml
+    with:
+      platform: linux/arm64
+
+  container-riscv64:
+    if: needs.files-changed.outputs.docker == 'true'
+    needs: [files-changed]
+    uses: ./.github/workflows/part-docker-dryrun.yml
+    with:
+      platform: linux/riscv64

.github/workflows/pull-e2e-tests.yml

@@ -39,10 +39,13 @@ jobs:
       - run: make deps-frontend
       - run: make frontend
       - run: make deps-backend
-      - run: make gitea-e2e
+      - run: make backend
+        env:
+          TAGS: bindata sqlite sqlite_unlock_notify
       - run: make playwright
       - run: make test-e2e
         timeout-minutes: 10
         env:
+          TAGS: bindata sqlite sqlite_unlock_notify
           FORCE_COLOR: 1
           GITEA_TEST_E2E_DEBUG: 1

.gitignore

@@ -55,10 +55,7 @@ cpu.out
 *.log.*.gz
 
 /gitea
-/gitea-e2e
-/gitea-vet
 /debug
-/integrations.test
 
 /bin
 /dist
@@ -68,7 +65,6 @@ cpu.out
 /indexers
 /log
 /public/assets/img/avatar
-/tests/e2e-output
 /tests/integration/gitea-integration-*
 /tests/integration/indexers-*
 /tests/*.ini

CONTRIBUTING.md

@@ -139,11 +139,11 @@ Here's how to run the test suite:
 
 - run tests (we suggest running them on Linux)
 
-|  Command                                    | Action                                                   |                                             |
-| :------------------------------------------ | :------------------------------------------------------- | ------------------------------------------- |
-|``make test[\#SpecificTestName]``            |  run unit test(s)                                        |                                             |
-|``make test-sqlite[\#SpecificTestName]``     |  run [integration](tests/integration) test(s) for SQLite | [More details](tests/integration/README.md) |
-|``make test-e2e``                            |  run [end-to-end](tests/e2e) test(s) using Playwright    |                                             |
+| Command                                       | Action                                               |                                             |
+|:----------------------------------------------|:-----------------------------------------------------| ------------------------------------------- |
+| ``make test-backend[\#SpecificTestName]``     | run unit test(s)                                     |                                             |
+| ``make test-integration[\#SpecificTestName]`` | run [integration](tests/integration) test(s)         | [More details](tests/integration/README.md) |
+| ``make test-e2e``                             | run [end-to-end](tests/e2e) test(s) using Playwright |                                             |
 
 - E2E test environment variables