test: Add sleep, move assertions

This brief sleep ensures that the Pod rotation has started before
the assertion (for readyReplicas) is run. Previously, the assertion
succeeded before the version upgrade was done and as such, the 07
assertion failed.

Author: Techassi

tests/templates/kuttl/upgrade/04-assert.yaml.j2

@@ -3,6 +3,7 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 timeout: 300
 commands:
+  # - script: kubectl wait -n $NAMESPACE --for='jsonpath={.status.readyReplicas}=3' sts/test-nifi-node-default --timeout=60s
   - script: kubectl exec -n $NAMESPACE test-nifi-0 -- python /tmp/test_nifi.py -u admin -p supersecretpassword -n $NAMESPACE -c 3
   - script: kubectl exec -n $NAMESPACE test-nifi-0 -- sh -c "python /tmp/flow.py > /tmp/old_input"
   # This tests if the output contains an Error or zero flow files are queued, which also indicates that something went wrong

…emplates/kuttl/upgrade/05-assert.yaml.j2 …emplates/kuttl/upgrade/06-assert.yaml.j2tests/templates/kuttl/upgrade/05-assert.yaml.j2 renamed to tests/templates/kuttl/upgrade/06-assert.yaml.j2 tests/templates/kuttl/upgrade/05-assert.yaml.j2 renamed to tests/templates/kuttl/upgrade/06-assert.yaml.j2

@@ -0,0 +1,8 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  # Sleep for a little while to ensure the pod rotation of the NiFi cluster has started. Otherwise,
+  # the assertion in 06 will immediately succeed because it is run _before_ the pod rotation has
+  # started.
+  - script: sleep 15

tests/templates/kuttl/upgrade/06-sleep.yaml

@@ -5,6 +5,7 @@ metadata:
   name: test-nifi-updated
 timeout: 300
 commands:
+  # - script: kubectl wait -n $NAMESPACE --for='jsonpath={.status.readyReplicas}=3' sts/test-nifi-node-default --timeout=60s
   - script: kubectl exec -n $NAMESPACE test-nifi-0 -- python /tmp/test_nifi.py -u admin -p supersecretpassword -n $NAMESPACE -c 3
   - script: kubectl exec -n $NAMESPACE test-nifi-0 -- sh -c "python /tmp/flow.py -e https://test-nifi-node-default-0.test-nifi-node-default-headless.$NAMESPACE.svc.cluster.local:8443 query > /tmp/new_input"
   # This tests if the output contains an Error or zero flow files are queued, which also indicates that something went wrong