Merge pull request redhat-appstudio#250 from gabemontero/exit-e2e-if-failed

periodic not failing when initial pr fails

Author: gabemontero

openshift-with-appstudio-test/e2e/jvm_build_service_test.go

@@ -110,13 +110,13 @@ func TestExampleRun(t *testing.T) {
 				ta.Logf(fmt.Sprintf("in flight pipeline run: %s", pr.Name))
 				return false, nil
 			}
-			if pr.IsDone() && !pr.GetStatusCondition().GetCondition(apis.ConditionSucceeded).IsTrue() {
+			if !pr.GetStatusCondition().GetCondition(apis.ConditionSucceeded).IsTrue() {
 				prBytes, err := json.MarshalIndent(pr, "", "  ")
 				if err != nil {
 					ta.Logf(fmt.Sprintf("problem marshalling failed pipelinerun to bytes: %s", err.Error()))
 					return false, nil
 				}
-				return false, fmt.Errorf("pipeline run did not succeed: %s", string(prBytes))
+				debugAndFailTest(ta, fmt.Sprintf("unsuccessful pipeline run: %s", string(prBytes)))
 			}
 			return true, nil
 		})

openshift-with-appstudio-test/e2e/periodic_test.go

@@ -19,8 +19,8 @@ import (
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"knative.dev/pkg/apis"
 )
@@ -136,15 +136,15 @@ func TestServiceRegistry(t *testing.T) {
 					return false, nil
 				}
 				ta.Logf(fmt.Sprintf("in flight pipeline run: %s", string(prBytes)))
+				return false, nil
 			}
 			if !pr.GetStatusCondition().GetCondition(apis.ConditionSucceeded).IsTrue() {
 				prBytes, err := json.MarshalIndent(pr, "", "  ")
 				if err != nil {
 					ta.Logf(fmt.Sprintf("problem marshalling failed pipelinerun to bytes: %s", err.Error()))
 					return false, nil
 				}
-				ta.Logf(fmt.Sprintf("not yet successful pipeline run: %s", string(prBytes)))
-
+				debugAndFailTest(ta, fmt.Sprintf("unsuccessful pipeline run: %s", string(prBytes)))
 			}
 			return true, nil
 		})