From 581fbd762dacaf144aeea26563a0cc1145799390 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 22 May 2025 20:23:28 +0300
Subject: try running integration tests without harbor

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d686966a6..5f3ca081c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,15 +42,15 @@ ttrss-fpm-pgsql-static:build:
     DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile
     IMAGE_TAR: ${IMAGE_TAR_FPM}
 
-ttrss-fpm-pgsql-static:push-master-commit-only:
-  extends: .crane-image-registry-push-master-commit-only
+ttrss-fpm-pgsql-static:push-master-commit-only-gitlab:
+  extends: .crane-image-registry-push-master-commit-only-gitlab
   variables:
     IMAGE_TAR: ${IMAGE_TAR_FPM}
   needs:
     - job: ttrss-fpm-pgsql-static:build
 
-ttrss-fpm-pgsql-static:push-branch:
-  extends: .crane-image-registry-push-branch
+ttrss-fpm-pgsql-static:push-branch-gitlab:
+  extends: .crane-image-registry-push-branch-gitlab
   variables:
     IMAGE_TAR: ${IMAGE_TAR_FPM}
   needs:
@@ -62,15 +62,15 @@ ttrss-web-nginx:build:
     DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile
     IMAGE_TAR: ${IMAGE_TAR_WEB}
 
-ttrss-web-nginx:push-master-commit-only:
-  extends: .crane-image-registry-push-master-commit-only
+ttrss-web-nginx:push-master-commit-only-gitlab:
+  extends: .crane-image-registry-push-master-commit-only-gitlab
   variables:
     IMAGE_TAR: ${IMAGE_TAR_WEB}
   needs:
     - job: ttrss-web-nginx:build
 
-ttrss-web-nginx:push-branch:
-  extends: .crane-image-registry-push-branch
+ttrss-web-nginx:push-branch-gitlab:
+  extends: .crane-image-registry-push-branch-gitlab
   variables:
     IMAGE_TAR: ${IMAGE_TAR_WEB}
   needs:
@@ -124,13 +124,13 @@ phpunit-integration:
       name: registry.fakecake.org/docker.io/postgres:15-alpine
       alias: db
     - &svc_app
-      name: registry.fakecake.org/cthulhoo/ttrss-fpm-pgsql-static:${CI_COMMIT_SHORT_SHA}
+      name: ${CI_REGISTRY}/${CI_PROJECT_PATH}/ttrss-fpm-pgsql-static:${CI_COMMIT_SHORT_SHA}
       alias: app
     - &svc_web
-      name: registry.fakecake.org/cthulhoo/ttrss-web-nginx:${CI_COMMIT_SHORT_SHA}
+      name: ${CI_REGISTRY}/${CI_PROJECT_PATH}/ttrss-web-nginx:${CI_COMMIT_SHORT_SHA}
       alias: web-nginx
   rules:
-    - if: $CI_COMMIT_BRANCH && $REGISTRY_USER != null
+    - if: $CI_COMMIT_BRANCH
   before_script:
     # wait for everything to start
     - |
-- 
cgit v1.2.3-54-g00ecf


From 3e5889394a5ce4b76793dd1ade33c1d3101b2cd1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 22 May 2025 20:50:46 +0300
Subject: use generic push commit job

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f3ca081c..9251a0da3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,15 +42,8 @@ ttrss-fpm-pgsql-static:build:
     DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile
     IMAGE_TAR: ${IMAGE_TAR_FPM}
 
-ttrss-fpm-pgsql-static:push-master-commit-only-gitlab:
-  extends: .crane-image-registry-push-master-commit-only-gitlab
-  variables:
-    IMAGE_TAR: ${IMAGE_TAR_FPM}
-  needs:
-    - job: ttrss-fpm-pgsql-static:build
-
-ttrss-fpm-pgsql-static:push-branch-gitlab:
-  extends: .crane-image-registry-push-branch-gitlab
+ttrss-fpm-pgsql-static:push-commit-only-gitlab:
+  extends: .crane-image-registry-push-commit-only-gitlab
   variables:
     IMAGE_TAR: ${IMAGE_TAR_FPM}
   needs:
@@ -62,15 +55,8 @@ ttrss-web-nginx:build:
     DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile
     IMAGE_TAR: ${IMAGE_TAR_WEB}
 
-ttrss-web-nginx:push-master-commit-only-gitlab:
-  extends: .crane-image-registry-push-master-commit-only-gitlab
-  variables:
-    IMAGE_TAR: ${IMAGE_TAR_WEB}
-  needs:
-    - job: ttrss-web-nginx:build
-
-ttrss-web-nginx:push-branch-gitlab:
-  extends: .crane-image-registry-push-branch-gitlab
+ttrss-web-nginx:push-commit-only-gitlab:
+  extends: .crane-image-registry-push-commit-only-gitlab
   variables:
     IMAGE_TAR: ${IMAGE_TAR_WEB}
   needs:
-- 
cgit v1.2.3-54-g00ecf


From a2a4e831cf35bd2f68ce71909fa993645b342ec6 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 22 May 2025 20:51:50 +0300
Subject: set some needs

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9251a0da3..b31db67f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,6 +117,9 @@ phpunit-integration:
       alias: web-nginx
   rules:
     - if: $CI_COMMIT_BRANCH
+  needs:
+    - job: ttrss-fpm-pgsql-static:push-commit-only-gitlab
+    - job: ttrss-web-nginx:push-commit-only-gitlab
   before_script:
     # wait for everything to start
     - |
-- 
cgit v1.2.3-54-g00ecf