From 00dc852791ae7a41553da4c70571b6561578b965 Mon Sep 17 00:00:00 2001
From: Daniel-I-Am <djdecloet@gmail.com>
Date: Sat, 28 May 2022 15:53:05 +0200
Subject: [PATCH] Switch around gitlab ci rules

---
 .gitlab-ci.yml | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9b8e1e7..3f46494 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,6 +25,7 @@ stages:
 "Build docker image":
   image: docker:stable
   stage: "Build Docker Image"
+  when: never
   tags:
   - docker
   - hawkeye
@@ -37,14 +38,13 @@ stages:
     # Build the image
     - 'make build-container DOCKER_REPOSITORY=$REGISTRY_BASE_URL/$DOCKER_IMAGE_NAME DOCKER_TAG=$CI_COMMIT_SHA'
   rules:
-  - if: '$REGISTRY_BASE_URL == null'
-    when: never
-  - if: '$DOCKER_IMAGE_NAME == null'
-    when: never
+  - if: '$REGISTRY_BASE_URL != null && $DOCKER_IMAGE_NAME != null'
+    when: always
 
 "Publish Docker Image":
   image: docker:stable
   stage: "Publish Docker Image"
+  when: never
   tags:
   - docker
   - hawkeye
@@ -58,30 +58,18 @@ stages:
     # Clean local image
     - 'docker image rm $REGISTRY_BASE_URL/$DOCKER_IMAGE_NAME:$CI_COMMIT_SHA'
   rules:
-  - if: '$REGISTRY_BASE_URL == null'
-    when: never
-  - if: '$DOCKER_IMAGE_NAME == null'
-    when: never
+  - if: '$REGISTRY_BASE_URL != null && $DOCKER_IMAGE_NAME != null'
+    when: always
 
 "Deploy to Production":
   image: bitnami/kubectl:1.23
   stage: "Deploy"
-  when: manual
+  when: never
   allow_failure: true
   dependencies:
     - "Publish Docker Image"
   script:
     - 'kubectl --kubeconfig=$K8S_CONFIG -n $K8S_NAMESPACE set image $K8S_DEPLOYMENT_TARGET $K8S_DEPLOYMENT_CONTAINER=$REGISTRY_BASE_URL/$DOCKER_IMAGE_NAME:$CI_COMMIT_SHA'
   rules:
-  - if: '$K8S_CONFIG == null'
-    when: never
-  - if: '$K8S_NAMESPACE == null'
-    when: never
-  - if: '$K8S_DEPLOYMENT_TARGET == null'
-    when: never
-  - if: '$K8S_DEPLOYMENT_CONTAINER == null'
-    when: never
-  - if: '$REGISTRY_BASE_URL == null'
-    when: never
-  - if: '$DOCKER_IMAGE_NAME == null'
-    when: never
+  - if: '$K8S_CONFIG != null && $K8S_NAMESPACE != null && $K8S_DEPLOYMENT_TARGET != null && $K8S_DEPLOYMENT_CONTAINER != null && $REGISTRY_BASE_URL != null && $DOCKER_IMAGE_NAME != null'
+    when: manual