Update current feature

e2e/argocd.sh

@@ -7,7 +7,7 @@
 
 set -euxo pipefail
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+DIR=$(cd "$(dirname "$0")"; pwd -P)
 
 CIUXCONFIG=${CIUXCONFIG:-"$HOME/.ciux/ciux.sh"}
 echo "CIUXCONFIG=${CIUXCONFIG}"
@@ -40,17 +40,17 @@ IMAGE="$CIUX_IMAGE_URL"
 echo "Use CIUX_IMAGE_URL to set fink-broker image: $CIUX_IMAGE_URL"
 if [[ "$IMAGE" =~ "-noscience" ]];
 then
-  FINKCONFIG="$DIR/finkconfig_noscience"
+  valueFile=values-fink-broker-ci-noscience.yaml
 else
-  FINKCONFIG="$DIR/finkconfig"
+  valueFile=values-fink-broker-ci-science.yaml
 fi
 
 # Create fink app
 argocd app create fink --dest-server https://kubernetes.default.svc \
     --dest-namespace "$NS" \
     --repo https://github.com/astrolabsoftware/fink-cd.git \
-    --path apps --revision "$FINK_CD_WORKBRANCH"
-    --values $FINKCONFIG/values-fink-broker.yaml
+    --path apps --revision "$FINK_CD_WORKBRANCH" \
+    --values $valueFile
 
 # Sync fink app-of-apps
 argocd app sync fink
@@ -72,7 +72,7 @@ retry kubectl wait --for condition=established --timeout=60s crd/kafkas.kafka.st
 # Set fink-broker parameters
 argocd app set fink-broker -p image.repository="$CIUX_IMAGE_REGISTRY" \
     -p image.name="$CIUX_IMAGE_NAME" \
-    -p image.tag="$CIUX_IMAGE_TAG" \
+    -p image.tag="$CIUX_IMAGE_TAG"
 argocd app sync -l app.kubernetes.io/instance=fink
 
 # TODO Wait for kafkatopic to exist