From adf3985afa594d0107bbaba2a0d5c3871ebc8701 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 29 Oct 2023 09:21:48 +0300
Subject: fix circular dependency

---
 .gitlab-ci.yml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f1109dc6..b6a82636a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,6 +61,18 @@ phpdoc:
         chmod 0600 ~/.ssh/id_ed25519
     - rsync -av -e 'ssh -o StrictHostKeyChecking=no' phpdoc/ ${PHPDOC_DEPLOY_HOST}:phpdoc/
 
+phpunit-integration:
+  image: ${PHP_IMAGE}
+  variables:
+    TEST_HELM_REPO: https://gitlab.tt-rss.org/tt-rss/helm-charts/tt-rss
+  extends: .integration-test
+  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/"
+    - php82 vendor/bin/phpunit --group integration
+  rules:
+    - if: $CI_COMMIT_BRANCH
+
 selenium:
   image: ${SELENIUM_IMAGE}
   variables:
@@ -75,16 +87,6 @@ selenium:
   needs:
     - job: phpunit-integration
 
-phpunit-integration:
-  image: ${PHP_IMAGE}
-  extends: selenium
-  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/"
-    - php82 vendor/bin/phpunit --group integration
-  rules:
-    - if: $CI_COMMIT_BRANCH
-
 ttrss-web-nginx:publish:
   stage: publish
   extends: .build-master
-- 
cgit v1.2.3