From afaef667830bad008c4d64b812719992e7091b57 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 29 Oct 2023 09:19:35 +0300
Subject: [PATCH] reduce targets

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce7be8695..0f1109dc6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,24 +71,19 @@ selenium:
     - export K8S_NAMESPACE=$(kubectl get pods -o=custom-columns=NS:.metadata.namespace | tail -1)
     - python3 tests/integration/selenium_test.py
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH
+  needs:
+    - job: phpunit-integration
 
-selenium:branch:
-  extends: selenium
-  rules:
-    - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_REGISTRY_USER != null
-      when: manual
-
-phpunit-integration:branch:
+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/"
-    - env
     - php82 vendor/bin/phpunit --group integration
   rules:
-    - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_REGISTRY_USER != null
+    - if: $CI_COMMIT_BRANCH
 
 ttrss-web-nginx:publish:
   stage: publish