From 7636f9767d1c4a9533368d08a27cab8ed7e1dbfe Mon Sep 17 00:00:00 2001
From: Daniel-I-Am <djdecloet@gmail.com>
Date: Sat, 28 May 2022 16:06:54 +0200
Subject: [PATCH] Retry gitlab rules

---
 .gitlab-ci.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f46494..60edab5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,6 @@ stages:
 "Build docker image":
   image: docker:stable
   stage: "Build Docker Image"
-  when: never
   tags:
   - docker
   - hawkeye
@@ -39,12 +38,10 @@ stages:
     - 'make build-container DOCKER_REPOSITORY=$REGISTRY_BASE_URL/$DOCKER_IMAGE_NAME DOCKER_TAG=$CI_COMMIT_SHA'
   rules:
   - 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
@@ -59,12 +56,11 @@ stages:
     - 'docker image rm $REGISTRY_BASE_URL/$DOCKER_IMAGE_NAME:$CI_COMMIT_SHA'
   rules:
   - if: '$REGISTRY_BASE_URL != null && $DOCKER_IMAGE_NAME != null'
-    when: always
 
 "Deploy to Production":
   image: bitnami/kubectl:1.23
   stage: "Deploy"
-  when: never
+  when: manual
   allow_failure: true
   dependencies:
     - "Publish Docker Image"
@@ -72,4 +68,3 @@ stages:
     - '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 && $K8S_NAMESPACE != null && $K8S_DEPLOYMENT_TARGET != null && $K8S_DEPLOYMENT_CONTAINER != null && $REGISTRY_BASE_URL != null && $DOCKER_IMAGE_NAME != null'
-    when: manual