You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2021/04/12 22:12:04 UTC
[camel-k] branch master updated (4db2ad1 -> 5636c90)
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from 4db2ad1 chore(ci): Ignore proposals directory changes
new 1de29d7 chore(test): test correct filtering of messages from Knative broker
new 17f8e88 fix broker creation
new 859b6f7 fix broker api version
new 5636c90 chore: fix test config
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/knative.yml | 2 +-
.../common/knative-broker/knative-broker.feature | 53 ++++++++++++++++++++++
.../yaks-config.yaml | 0
3 files changed, 54 insertions(+), 1 deletion(-)
create mode 100644 e2e/yaks/common/knative-broker/knative-broker.feature
copy e2e/yaks/common/{kamelet-no-properties => knative-broker}/yaks-config.yaml (100%)
[camel-k] 04/04: chore: fix test config
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 5636c90346822dcc0098d47039f46c0b841f2761
Author: nicolaferraro <ni...@gmail.com>
AuthorDate: Mon Apr 12 17:37:03 2021 +0200
chore: fix test config
---
.github/workflows/knative.yml | 2 +-
e2e/yaks/common/knative-broker/yaks-config.yaml | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/.github/workflows/knative.yml b/.github/workflows/knative.yml
index 27c6d44..26bf050 100644
--- a/.github/workflows/knative.yml
+++ b/.github/workflows/knative.yml
@@ -193,7 +193,7 @@ jobs:
go-version: 1.13.x
- name: Get YAKS
run: |
- export YAKS_VERSION=0.4.0-202104070030
+ export YAKS_VERSION=0.4.0-202104120032
curl --fail -L https://github.com/citrusframework/yaks/releases/download/${YAKS_VERSION}/yaks-${YAKS_VERSION}-linux-64bit.tar.gz -o yaks.tar.gz
tar -zxf yaks.tar.gz
sudo mv yaks /usr/local/bin/
diff --git a/e2e/yaks/common/knative-broker/yaks-config.yaml b/e2e/yaks/common/knative-broker/yaks-config.yaml
index 63bc00a..95d9bf9 100644
--- a/e2e/yaks/common/knative-broker/yaks-config.yaml
+++ b/e2e/yaks/common/knative-broker/yaks-config.yaml
@@ -16,9 +16,6 @@
# ---------------------------------------------------------------------------
config:
- runtime:
- env:
- YAKS_KNATIVE_API_VERSION: eventing.knative.dev/v1
namespace:
temporary: true
pre:
[camel-k] 03/04: fix broker api version
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 859b6f775ff961b6940db9f2cb6883f7f3861b4e
Author: nicolaferraro <ni...@gmail.com>
AuthorDate: Thu Apr 8 15:13:58 2021 +0200
fix broker api version
---
e2e/yaks/common/knative-broker/knative-broker.feature | 3 ++-
e2e/yaks/common/knative-broker/yaks-config.yaml | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/e2e/yaks/common/knative-broker/knative-broker.feature b/e2e/yaks/common/knative-broker/knative-broker.feature
index becb2e5..e3ce423 100644
--- a/e2e/yaks/common/knative-broker/knative-broker.feature
+++ b/e2e/yaks/common/knative-broker/knative-broker.feature
@@ -39,7 +39,8 @@ Feature: Camel K can correctly filter messages from broker
from('knative:event')
.log('From all: $simple{body}')
"""
- Then Camel-K integration receiver should print From evt1: event-1
+ Then Camel-K integration receiver should be running
+ And Camel-K integration receiver should print From evt1: event-1
And Camel-K integration receiver should print From evt2: event-2
And Camel-K integration receiver should print From all: event-1
And Camel-K integration receiver should print From all: event-2
diff --git a/e2e/yaks/common/knative-broker/yaks-config.yaml b/e2e/yaks/common/knative-broker/yaks-config.yaml
index 95d9bf9..63bc00a 100644
--- a/e2e/yaks/common/knative-broker/yaks-config.yaml
+++ b/e2e/yaks/common/knative-broker/yaks-config.yaml
@@ -16,6 +16,9 @@
# ---------------------------------------------------------------------------
config:
+ runtime:
+ env:
+ YAKS_KNATIVE_API_VERSION: eventing.knative.dev/v1
namespace:
temporary: true
pre:
[camel-k] 01/04: chore(test): test correct filtering of messages
from Knative broker
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 1de29d7943d64c58baebe31dbf058bb5cb6064e6
Author: nicolaferraro <ni...@gmail.com>
AuthorDate: Fri Mar 12 11:16:50 2021 +0100
chore(test): test correct filtering of messages from Knative broker
---
.../common/knative-broker/knative-broker.feature | 51 ++++++++++++++++++++++
e2e/yaks/common/knative-broker/yaks-config.yaml | 24 ++++++++++
2 files changed, 75 insertions(+)
diff --git a/e2e/yaks/common/knative-broker/knative-broker.feature b/e2e/yaks/common/knative-broker/knative-broker.feature
new file mode 100644
index 0000000..f95b7b6
--- /dev/null
+++ b/e2e/yaks/common/knative-broker/knative-broker.feature
@@ -0,0 +1,51 @@
+Feature: Camel K can correctly filter messages from broker
+
+ Background:
+ Given Knative broker default is running
+ Given Disable auto removal of Camel-K resources
+ Given Disable auto removal of Kubernetes resources
+ Given Camel-K resource polling configuration
+ | maxAttempts | 60 |
+ | delayBetweenAttempts | 3000 |
+
+ Scenario: Integration sends messages to the broker
+ Given create Camel-K integration sender.groovy
+ """
+ from('timer:tick?period=1000')
+ .setBody().constant('event-1')
+ .to('knative:event/evt1')
+
+ from('timer:tick?period=1000')
+ .setBody().constant('event-2')
+ .to('knative:event/evt2')
+
+ from('timer:tick?period=1000')
+ .setBody().constant('event-all')
+ .to('knative:event')
+ """
+ Then Camel-K integration sender should be running
+
+
+ Scenario: Integration receives the correct messages from the broker
+ Given create Camel-K integration receiver.groovy
+ """
+ from('knative:event/evt1')
+ .log('From evt1: $simple{body}')
+
+ from('knative:event/evt2')
+ .log('From evt2: $simple{body}')
+
+ from('knative:event')
+ .log('From all: $simple{body}')
+ """
+ Then Camel-K integration receiver should print From evt1: event-1
+ And Camel-K integration receiver should print From evt2: event-2
+ And Camel-K integration receiver should print From all: event-1
+ And Camel-K integration receiver should print From all: event-2
+ And Camel-K integration receiver should print From all: event-all
+ And Camel-K integration receiver should not print From evt1: event-2
+ And Camel-K integration receiver should not print From evt1: event-all
+ And Camel-K integration receiver should not print From evt2: event-1
+ And Camel-K integration receiver should not print From evt2: event-all
+ And delete Camel-K integration sender
+ And delete Camel-K integration receiver
diff --git a/e2e/yaks/common/knative-broker/yaks-config.yaml b/e2e/yaks/common/knative-broker/yaks-config.yaml
new file mode 100644
index 0000000..95d9bf9
--- /dev/null
+++ b/e2e/yaks/common/knative-broker/yaks-config.yaml
@@ -0,0 +1,24 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+config:
+ namespace:
+ temporary: true
+pre:
+- name: installation
+ run: |
+ kamel install -n $YAKS_NAMESPACE
[camel-k] 02/04: fix broker creation
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 17f8e88cd512ca9f80d6f535d1cc9772aa4a9237
Author: nicolaferraro <ni...@gmail.com>
AuthorDate: Thu Apr 8 12:39:22 2021 +0200
fix broker creation
---
e2e/yaks/common/knative-broker/knative-broker.feature | 1 +
1 file changed, 1 insertion(+)
diff --git a/e2e/yaks/common/knative-broker/knative-broker.feature b/e2e/yaks/common/knative-broker/knative-broker.feature
index f95b7b6..becb2e5 100644
--- a/e2e/yaks/common/knative-broker/knative-broker.feature
+++ b/e2e/yaks/common/knative-broker/knative-broker.feature
@@ -1,6 +1,7 @@
Feature: Camel K can correctly filter messages from broker
Background:
+ Given create Knative broker default
Given Knative broker default is running
Given Disable auto removal of Camel-K resources
Given Disable auto removal of Kubernetes resources