From 361f395c1272ce5ea63aeff6734e752606d82e3b Mon Sep 17 00:00:00 2001
From: Wilfried BARADAT <wilfried.baradat@fun-mooc.fr>
Date: Mon, 12 Feb 2024 19:22:01 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=9A(circle)=20test=20helm=20with=20ral?=
 =?UTF-8?q?ph=20build=20image?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In the `test-helm` job, we were building Ralph current image but were installing
the helm chart without specifying an image tag. When not specified, Helm
installs the `appVersion` of the image, fetching it from DockerHub repository
and not testing the current build of the image.
Changing it so that the job tests the current build of the image for non-tagged
workflows, but also tests that the `appVersion` has correctly been filled in for
`-helm` tagged workflows.
---
 .circleci/config.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7dc9691a2..7169f089f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -367,12 +367,12 @@ jobs:
             kubectl create namespace ci-ralph
             kubectl config set-context --current --namespace=ci-ralph
       - run:
-          name: Build production image and publish it to the k8s cluster docker registry
+          name: Build production image and load it in the k8s cluster docker registry
           command: |
-            export RALPH_IMAGE_BUILD_TARGET=production
-            export RALPH_IMAGE_TAG=${CIRCLE_SHA1} 
-            make build
-            minikube image load ralph:${RALPH_IMAGE_TAG}
+            RALPH_IMAGE_BUILD_TARGET=production \
+            RALPH_IMAGE_TAG=${CIRCLE_SHA1} \
+              make build
+            minikube image load ralph:${CIRCLE_SHA1}
       - run:
           name: Deploy Elasticsearch cluster
           command: |
@@ -405,6 +405,14 @@ jobs:
             sed -i -e "s|<PASSWORD>|${ELASTIC_PASSWORD}|g" manifests/ralph-env-secret.yaml
             kubectl apply -f manifests/ralph-env-secret.yaml
             kubectl apply -f manifests/ralph-env-cm.yaml
+            if [[ -z "${CIRCLE_TAG+x}" ]] || ! [[ "$CIRCLE_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+-helm$ ]]; then
+              # Not a tagged workflow, or tagged but not for a Helm release:
+              # change the repository and app version for the currently built version
+              sed -i "s|repository:.*$|repository: docker.io/library/ralph|" development.yaml
+              sed -i "s|tag:.*$|tag: \"${CIRCLE_SHA1}\"|" development.yaml
+            fi
+
+            # Install Ralph
             helm install -f development.yaml lrs ralph/
 
             # Test the deployment/switch