try switching phpunit off helm

1 files changed, 28 insertions, 11 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a73b4a7dc..a54138312 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,16 +105,35 @@ phpdoc:publish:
 phpunit-integration:
   image: ${PHP_IMAGE}
   variables:
-    TEST_HELM_REPO: oci://registry.fakecake.org/infra/helm-charts/tt-rss
-  extends: .integration-test
+    POSTGRES_DB: postgres
+    POSTGRES_USER: postgres
+    POSTGRES_PASSWORD: password
+    TTRSS_DB_HOST: db
+    TTRSS_DB_USER: ${POSTGRES_USER}
+    TTRSS_DB_NAME: ${POSTGRES_DB}
+    TTRSS_DB_PASS: ${POSTGRES_PASSWORD}
+    FF_NETWORK_PER_BUILD: "true"
+    APP_WEB_ROOT: /builds/shared-root
+    AUTO_CREATE_USER: test
+    AUTO_CREATE_USER_PASS: 'test'
+    AUTO_CREATE_USER_ACCESS_LEVEL: '10'
+    AUTO_CREATE_USER_ENABLE_API: 'true'
+  services:
+    - name: registry.fakecake.org/docker.io/postgres:15-alpine
+      alias: db
+    - name: registry.fakecake.org/cthulhoo/ttrss-fpm-pgsql-static:${CI_COMMIT_SHORT_SHA}
+      alias: app
+    - name: registry.fakecake.org/cthulhoo/ttrss-web-nginx:${CI_COMMIT_SHORT_SHA}
+      alias: web-nginx
+  rules:
+    - if: $CI_COMMIT_BRANCH && $REGISTRY_USER != null
   script:
-    - export K8S_NAMESPACE=$(kubectl get pods -o=custom-columns=NS:.metadata.namespace | tail -1)
-    - export API_URL="http://tt-rss-${CI_COMMIT_SHORT_SHA}-app.$K8S_NAMESPACE.svc.cluster.local/tt-rss/api/"
-    - export TTRSS_DB_HOST=tt-rss-${CI_COMMIT_SHORT_SHA}-app.$K8S_NAMESPACE.svc.cluster.local
-    - export TTRSS_DB_USER=postgres
-    - export TTRSS_DB_NAME=postgres
-    - export TTRSS_DB_PASS=password
-    - php83 vendor/bin/phpunit --group integration --do-not-cache-result --log-junit phpunit-report.xml --coverage-cobertura phpunit-coverage.xml --coverage-text --colors=never
+    - export API_URL="http://web-nginx/tt-rss/api/"
+    - |
+      for a in `seq 1 15`; do
+        php83 vendor/bin/phpunit --group integration --do-not-cache-result --log-junit phpunit-report.xml --coverage-cobertura phpunit-coverage.xml --coverage-text --colors=never && exit 0
+        sleep 10
+      done
   artifacts:
     when: always
     reports:
@@ -123,8 +142,6 @@ phpunit-integration:
         coverage_format: cobertura
         path: phpunit-coverage.xml
   coverage: '/^\s*Lines:\s*\d+.\d+\%/'
-  tags:
-    - $RUNNER_TAG_INTEGRATION
 
 selenium:
   image: ${SELENIUM_IMAGE}