refactor(ci): simplify

Signed-off-by: Chris Laprun <[email protected]>

Author: metacosm

.github/scripts/testJokeSample.sh

@@ -3,6 +3,7 @@ NAMESPACE="${1}"
 
 # Ensure the CRD is installed
 if ! .github/scripts/waitFor.sh crd $NAMESPACE jokerequests.samples.javaoperatorsdk.io; then
+  echo "CRD not installed: cannot run the Joke operator"
   exit 1;
 fi
 
@@ -11,6 +12,7 @@ kubectl apply -f samples/joke/src/main/k8s/jokerequest.yml
 
 # And wait for the operator to create another Joke resource
 if ! .github/scripts/waitFor.sh joke $NAMESPACE NAME; then
+  echo "Joke was not properly created in response to request"
   exit 1;
 fi
 

.github/workflows/build-for-quarkus-version.yml

@@ -209,16 +209,9 @@ jobs:
           PID=$(echo $!)
           cd $CURRENT_PWD
 
-          ERROR=0
-          # Wait until the app installed the jokerequest custom resource definition
-          if ! $SCRIPTS/waitFor.sh crd $K8S_NAMESPACE jokerequests.samples.javaoperatorsdk.io; then
-            echo "CRD not installed"
-            ERROR=1
-          fi
-
           # test joke sample
+          ERROR=0
           if ! $SCRIPTS/testJokeSample.sh $K8S_NAMESPACE; then
-            echo "Failed to interact with operator"
             ERROR=1
           fi
           
@@ -261,15 +254,7 @@ jobs:
           cd $CURRENT_PWD
 
           ERROR=0
-          # Wait until the app installed the jokerequest custom resource definition
-          if ! $SCRIPTS/waitFor.sh crd $K8S_NAMESPACE jokerequests.samples.javaoperatorsdk.io; then
-            echo "CRD not installed"
-            ERROR=1
-          fi
-
-          # test joke sample
-          if [ ERROR = 0 ] && ! $SCRIPTS/testJokeSample.sh $K8S_NAMESPACE; then
-            echo "Failed to interact with operator"
+          if ! $SCRIPTS/testJokeSample.sh $K8S_NAMESPACE; then
             ERROR=1
           fi