Stop testing the helm operator in e2e tests

fluxcd · Oct 23, 2019 · a7dfa9d · a7dfa9d
1 parent cd599ff
commit a7dfa9d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/test/e2e/helm_chart_smoke_test.bats b/test/e2e/helm_chart_smoke_test.bats
@@ -66,12 +66,12 @@ function setup() {
   done
   echo ' done' >&3
 
-  echo -n '>>> Waiting for Helm release mongodb ' >&3
+  echo -n '>>> Waiting for mongodb HelmRelease ' >&3
   retries=24
   count=0
   ok=false
   until ${ok}; do
-    kubectl -n $DEMO_NAMESPACE describe deployment/mongodb && ok=true || ok=false
+    kubectl -n $DEMO_NAMESPACE describe helmrelease/mongodb && ok=true || ok=false
     echo -n '.' >&3
     sleep 5
     count=$(($count + 1))
@@ -88,8 +88,6 @@ function setup() {
   echo '>>> Check workload' >&3
   kubectl -n "${DEMO_NAMESPACE}" rollout status deployment/podinfo
 
-  echo '>>> Check Helm release' >&3
-  kubectl -n "${DEMO_NAMESPACE}" rollout status deployment/mongodb
 }
 
 function teardown() {
@@ -103,4 +101,4 @@ function teardown() {
   uninstall_tiller
   uninstall_git_srv
   kubectl delete namespace demo
-}
+}
diff --git a/test/e2e/lib/install.bash b/test/e2e/lib/install.bash
@@ -32,12 +32,11 @@ function install_flux_with_helm() {
 --set git.config.secretName=gitconfig \
 --set git.config.enabled=true \
 --set-string git.config.data="${GITCONFIG}" \
---set helmOperator.create=true \
---set helmOperator.createCRD=true \
+--set helmOperator.create=true `# just needed to add the HelmRelease CRD`\
 --set helmOperator.git.secretName=ssh-git \
+--set helmOperator.createCRD="${create_crds}" \
 --set registry.excludeImage=* \
 --set-string ssh.known_hosts="${KNOWN_HOSTS}" \
---set helmOperator.createCRD="${create_crds}" \
 "${FLUX_ROOT_DIR}/chart/flux"
 
 }