Patch kuttl test to work with releases (#307)

Patch kuttl test to work with releases

Makefile

@@ -52,11 +52,7 @@ endif
 BASEVERSION := $(shell awk -F\" '/Version =/ { print $$2}' version/version.go)
 # Version is for binary, docker image and helm
 
-ifdef CIRCLE_TAG
-	VERSION := ${BRANCH}
-else
-	VERSION := $(BASEVERSION)-${BRANCH}
-endif
+VERSION := ${BRANCH}
 
 HELM_VERSION    := $(shell cat helm/cassandra-operator/Chart.yaml| grep version | awk -F"version: " '{print $$2}')
 HELM_TARGET_DIR ?= docs/helm

test/e2e/kuttl/ScaleUpAndDown/00-createCluster.yaml

@@ -3,7 +3,7 @@ kind: TestStep
 commands:
   - script: |
       BASEDIR=../../../..
-      VERSION=$(awk -F\" '/Version =/ {print $2}' $BASEDIR/version/version.go)-$CIRCLE_BRANCH
+      VERSION=$([ -n "$CIRCLE_TAG" ] && echo $CIRCLE_TAG || echo $CIRCLE_BRANCH)
       helm install casskop $BASEDIR/helm/cassandra-operator --set image.tag=$VERSION --namespace $NAMESPACE
 ---
 apiVersion: db.orange.com/v1alpha1
@@ -27,4 +27,4 @@ spec:
     dc:
       - name: dc1
         rack:
-          - name: rack1
+          - name: rack1