From da4c2faa4a1ea4f1f2cb25c8074eb6ba82576b44 Mon Sep 17 00:00:00 2001 From: Scott Andrews Date: Tue, 31 Jul 2018 20:22:55 -0400 Subject: [PATCH 1/2] Unbreak integration tests The Channel Ready condition is an aggregation of ChannelProvisioned, ChannelRoutable and ChannelServiceable. However, ChannelProvisioned is not reliably set by the bus provisioner. Until it is reliable, it should not be used to indicate the Channel is ready as it also propagates into the Flow Ready condition. This change will be reverted as part of issue #285. Until then, the integration test suite will be unblocked. --- pkg/controller/util/channel_util.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/controller/util/channel_util.go b/pkg/controller/util/channel_util.go index 2fbce0caca0..26ac5ca26b3 100644 --- a/pkg/controller/util/channel_util.go +++ b/pkg/controller/util/channel_util.go @@ -69,7 +69,8 @@ func RemoveChannelCondition(status *v1alpha1.ChannelStatus, condType v1alpha1.Ch // given all other sub-conditions. func ConsolidateChannelCondition(status *v1alpha1.ChannelStatus) { subConditionsTypes := []v1alpha1.ChannelConditionType{ - v1alpha1.ChannelProvisioned, + // TODO restore ChannelProvisioned condition with issue #285 + // v1alpha1.ChannelProvisioned, v1alpha1.ChannelRoutable, v1alpha1.ChannelServiceable, } From c70c5598e47037cfc05377a38d48a89f6ff4495d Mon Sep 17 00:00:00 2001 From: Scott Andrews Date: Wed, 1 Aug 2018 11:41:43 -0400 Subject: [PATCH 2/2] Add channel and subscription dump on flow failure --- test/e2e-tests.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh index 957d3329015..8e1b6da1e34 100755 --- a/test/e2e-tests.sh +++ b/test/e2e-tests.sh @@ -72,6 +72,8 @@ function wait_until_flow_ready() { kubectl get -n $NAMESPACE flows $NAME -oyaml kubectl get -n $NAMESPACE jobs $NAME-start -oyaml kubectl get -n $NAMESPACE feeds $NAME -oyaml + kubectl get -n $NAMESPACE channels $NAME -oyaml + kubectl get -n $NAMESPACE subscriptions $NAME -oyaml echo -e "Dumping controller manager logs" kubectl -n knative-eventing logs `kubectl -n knative-eventing get pods -oname | grep controller-manager` controller-manager echo -e "Dumping controller logs"