From a430bf382783ee535b7644960bf8b76644feab4e Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <sarah.vaupel@uniworx.de>
Date: Sun, 25 Aug 2024 05:57:48 +0200
Subject: [PATCH] ci(gitlab-ci): cleanup dynamic frontend and backend
 downstream pipelines

---
 .gitlab-ci/backend.yml  | 15 +++------------
 .gitlab-ci/frontend.yml | 10 ----------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci/backend.yml b/.gitlab-ci/backend.yml
index 6e798d9dc..63937e460 100644
--- a/.gitlab-ci/backend.yml
+++ b/.gitlab-ci/backend.yml
@@ -38,11 +38,8 @@ compile:
   needs:
     - job: container
       optional: true
-#  image: &backend-image ${CI_REGISTRY_IMAGE}/backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION}
   script:
-#    - &load-backend-image zcat docker/backend/image.tar.gz | podman image load
-#    - make -- --docker-run-backend-build FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose
-    - make -- run-backend-build FRADRIVE_SERVICE=backend
+    - make -- backend-build
   artifacts:
     paths:
       - /fradrive/.stack/
@@ -54,11 +51,8 @@ lint:
   needs:
     - job: container
       optional: true
-#  image: *backend-image
   script:
-#    - *load-backend-image
-#    - make -- --docker-run-backend-lint FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose
-    - make -- backend-lint FRADRIVE_SERVICE=backend
+    - make -- backend-lint
   cache: *backend-cache
 
 test:
@@ -67,9 +61,6 @@ test:
     - job: container
       optional: true
     - compile
-#  image: *backend-image
   script:
-#    - *load-backend-image
-#    - make -- --docker-run-backend-test FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose
-    - make -- backend-test FRADRIVE_SERVICE=backend
+    - make -- backend-test
   cache: *backend-cache
diff --git a/.gitlab-ci/frontend.yml b/.gitlab-ci/frontend.yml
index 8f9a3e9a2..a81857aec 100644
--- a/.gitlab-ci/frontend.yml
+++ b/.gitlab-ci/frontend.yml
@@ -34,10 +34,7 @@ default:
 
 compile:
   stage: compile
-#  image: &frontend-image ${CI_REGISTRY_IMAGE}/frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION}
   script:
-#    - &load-frontend-image zcat docker/frontend/image.tar.gz | podman image load
-#    - make -- --docker-run-frontend-build FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose
     - make -- frontend-build
   artifacts:
     paths:
@@ -52,11 +49,7 @@ compile:
 
 lint:
   stage: lint
-  needs:
-#  image: *frontend-image
   script:
-#    - *load-frontend-image
-#    - make -- --docker-run-frontend-lint FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose
     - make -- frontend-lint
   cache: *frontend-cache
 
@@ -64,9 +57,6 @@ test:
   stage: test
   needs:
     - compile
-#  image: *frontend-image
   script:
-#    - *load-frontend-image
-#    - make -- --docker-run-frontend-test FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose
     - make -- frontend-test
   cache: *frontend-cache