From 8e2398c23436e098c58c09b141958a0b4749b2c3 Mon Sep 17 00:00:00 2001
From: Saibotk <git@saibotk.de>
Date: Sat, 14 Oct 2023 01:10:19 +0200
Subject: [PATCH] ci: Switch to 4gb runner for now & remove dedicated deploy
 branch

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a011f08..deda5b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,58 +36,21 @@ build:
     expire_in: 1 week
 
 package:
-  stage: package
-  interruptible: true
-  image: quay.io/sheogorath/build-ah-engine:latest
-  tags:
-    - privileged
-  variables:
-    LANG: C.UTF-8
-  before_script:
-    - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-  script:
-    - podman build --pull -f .docker/Dockerfile -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
-    - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
-  except:
-    - deploy
-
-package-deploy:
   stage: package
   interruptible: true
   image: quay.io/sheogorath/build-ah-engine:latest
   variables:
     LANG: C.UTF-8
   tags:
-    - privileged
+    - privileged-ram-4gb
   before_script:
     - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - podman build --pull -f .docker/Dockerfile -t "$CI_REGISTRY_IMAGE" .
+    - podman build --pull -f .docker/Dockerfile -t "$CI_REGISTRY_IMAGE" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
     - podman push "$CI_REGISTRY_IMAGE"
-  only:
-    - deploy
+    - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
 
 test:
-  stage: test
-  interruptible: true
-  tags:
-    - privileged
-  image: quay.io/sheogorath/build-ah-engine:latest
-  variables:
-    LANG: C.UTF-8
-  before_script:
-    - dnf install curl
-  script:
-    - podman run -d -p 8080:80 --name testing $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-    - sleep 5
-    - podman exec testing nginx -c /etc/nginx/nginx.conf -t
-    - curl http://localhost:8080/status.txt | grep -q 'OK'
-    - podman stop testing
-    - podman rm testing
-  except:
-    - deploy
-
-test-deploy:
   stage: test
   interruptible: true
   tags:
@@ -104,8 +67,6 @@ test-deploy:
     - curl http://localhost:8080/status.txt | grep -q 'OK'
     - podman stop testing
     - podman rm testing
-  only:
-    - deploy
 
 deploy:
   stage: deploy
@@ -114,5 +75,3 @@ deploy:
   trigger:
     project: saibotk.de/infrastructure-private
     strategy: depend
-  only:
-    - deploy