You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2022/08/25 12:34:58 UTC
[camel-k] branch main updated (cd4e440d3 -> 542e66db7)
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from cd4e440d3 chore(deps): bump go.uber.org/zap from 1.22.0 to 1.23.0
new d6b29bdc8 chore(build): Use global operator setup for YAKS E2E tests
new 542e66db7 chore(build): Reduce time to wait for Knative messages in YAKS tests
The 2 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/actions/e2e-knative-yaks/action.yml | 13 +++++++++++++
e2e/yaks/common/apache-kamelet-catalog/yaks-config.yaml | 4 ----
e2e/yaks/common/kamelet-beans/yaks-config.yaml | 2 --
e2e/yaks/common/kamelet-binding-autoload/yaks-config.yaml | 2 --
e2e/yaks/common/kamelet-binding-broker/yaks-config.yaml | 2 --
e2e/yaks/common/kamelet-binding-http/yaks-config.yaml | 2 --
.../kamelet-binding-property-encoding/yaks-config.yaml | 2 --
e2e/yaks/common/kamelet-binding/yaks-config.yaml | 2 --
e2e/yaks/common/kamelet-no-properties/yaks-config.yaml | 4 ----
e2e/yaks/common/kamelet-steps/yaks-config.yaml | 2 --
e2e/yaks/common/kamelet/yaks-config.yaml | 2 --
e2e/yaks/common/knative-broker/knative-broker.feature | 3 +++
e2e/yaks/common/knative-broker/yaks-config.yaml | 4 ----
e2e/yaks/common/knative-sinkbinding/yaks-config.yaml | 2 --
e2e/yaks/openshift/monitoring/yaks-config.yaml | 5 +----
15 files changed, 17 insertions(+), 34 deletions(-)
[camel-k] 02/02: chore(build): Reduce time to wait for Knative messages in YAKS tests
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 542e66db71f89156780a144757b488a01e40c254
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Thu Aug 25 08:27:35 2022 +0200
chore(build): Reduce time to wait for Knative messages in YAKS tests
Significantly reduces the YAKS E2E test job execution time
---
e2e/yaks/common/knative-broker/knative-broker.feature | 3 +++
1 file changed, 3 insertions(+)
diff --git a/e2e/yaks/common/knative-broker/knative-broker.feature b/e2e/yaks/common/knative-broker/knative-broker.feature
index d7ed101b6..548d52c70 100644
--- a/e2e/yaks/common/knative-broker/knative-broker.feature
+++ b/e2e/yaks/common/knative-broker/knative-broker.feature
@@ -45,6 +45,9 @@ Feature: Camel K can correctly filter messages from broker
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 resource polling configuration
+ | maxAttempts | 5 |
+ | delayBetweenAttempts | 1000 |
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
[camel-k] 01/02: chore(build): Use global operator setup for YAKS E2E tests
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit d6b29bdc83e8978175a957a699be85cef42e45c3
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Wed Aug 24 19:23:23 2022 +0200
chore(build): Use global operator setup for YAKS E2E tests
---
.github/actions/e2e-knative-yaks/action.yml | 13 +++++++++++++
e2e/yaks/common/apache-kamelet-catalog/yaks-config.yaml | 4 ----
e2e/yaks/common/kamelet-beans/yaks-config.yaml | 2 --
e2e/yaks/common/kamelet-binding-autoload/yaks-config.yaml | 2 --
e2e/yaks/common/kamelet-binding-broker/yaks-config.yaml | 2 --
e2e/yaks/common/kamelet-binding-http/yaks-config.yaml | 2 --
.../kamelet-binding-property-encoding/yaks-config.yaml | 2 --
e2e/yaks/common/kamelet-binding/yaks-config.yaml | 2 --
e2e/yaks/common/kamelet-no-properties/yaks-config.yaml | 4 ----
e2e/yaks/common/kamelet-steps/yaks-config.yaml | 2 --
e2e/yaks/common/kamelet/yaks-config.yaml | 2 --
e2e/yaks/common/knative-broker/yaks-config.yaml | 4 ----
e2e/yaks/common/knative-sinkbinding/yaks-config.yaml | 2 --
e2e/yaks/openshift/monitoring/yaks-config.yaml | 5 +----
14 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/.github/actions/e2e-knative-yaks/action.yml b/.github/actions/e2e-knative-yaks/action.yml
index 56d13850a..6d0ff89b2 100644
--- a/.github/actions/e2e-knative-yaks/action.yml
+++ b/.github/actions/e2e-knative-yaks/action.yml
@@ -90,6 +90,19 @@ runs:
image-registry-insecure: ${{steps.config-cluster.outputs.cluster-image-registry-insecure }}
image-version: ${{ steps.build-kamel.outputs.build-binary-local-image-version }}
+ - id: install-global-operator
+ name: "Install Global Operator"
+ uses: ./.github/actions/kamel-install-global-operator
+ with:
+ global-operator-namespace: default
+ catalog-source-name: ${{ steps.config-cluster.outputs.cluster-catalog-source-name }}
+ catalog-source-namespace: ${{ steps.config-cluster.outputs.cluster-catalog-source-namespace }}
+ image-namespace: ${{ steps.config-cluster.outputs.cluster-image-namespace }}
+ image-registry-host: ${{ steps.config-cluster.outputs.cluster-image-registry-pull-host }}
+ image-name: ${{ steps.build-kamel.outputs.build-binary-local-image-name }}
+ image-registry-insecure: ${{steps.config-cluster.outputs.cluster-image-registry-insecure }}
+ image-version: ${{ steps.build-kamel.outputs.build-binary-local-image-version }}
+
- name: Install YAKS
uses: ./.github/actions/kamel-install-yaks
with:
diff --git a/e2e/yaks/common/apache-kamelet-catalog/yaks-config.yaml b/e2e/yaks/common/apache-kamelet-catalog/yaks-config.yaml
index 0f51eb08b..ef5c6f9fb 100644
--- a/e2e/yaks/common/apache-kamelet-catalog/yaks-config.yaml
+++ b/e2e/yaks/common/apache-kamelet-catalog/yaks-config.yaml
@@ -21,10 +21,6 @@ config:
pre:
- name: installation
run: |
- kamel install -w -n $YAKS_NAMESPACE --force
-
- kubectl wait kamelets.camel.apache.org/timer-source --for=condition=Ready --timeout=120s -n $YAKS_NAMESPACE
-
kamel run logger.groovy -w -n $YAKS_NAMESPACE
post:
- name: print dump
diff --git a/e2e/yaks/common/kamelet-beans/yaks-config.yaml b/e2e/yaks/common/kamelet-beans/yaks-config.yaml
index a4740932d..b36550c2e 100644
--- a/e2e/yaks/common/kamelet-beans/yaks-config.yaml
+++ b/e2e/yaks/common/kamelet-beans/yaks-config.yaml
@@ -21,8 +21,6 @@ config:
pre:
- name: installation
run: |
- kamel install -n $YAKS_NAMESPACE --force
-
kubectl apply -f beans-source.kamelet.yaml -n $YAKS_NAMESPACE
post:
- name: print dump
diff --git a/e2e/yaks/common/kamelet-binding-autoload/yaks-config.yaml b/e2e/yaks/common/kamelet-binding-autoload/yaks-config.yaml
index aeb395279..c4cadc19a 100644
--- a/e2e/yaks/common/kamelet-binding-autoload/yaks-config.yaml
+++ b/e2e/yaks/common/kamelet-binding-autoload/yaks-config.yaml
@@ -21,8 +21,6 @@ config:
pre:
- name: installation
run: |
- kamel install -n $YAKS_NAMESPACE --force --operator-env-vars KAMEL_INSTALL_DEFAULT_KAMELETS=false
-
kubectl apply -f secret-default.yaml -n $YAKS_NAMESPACE
kubectl apply -f secret-specific.yaml -n $YAKS_NAMESPACE
diff --git a/e2e/yaks/common/kamelet-binding-broker/yaks-config.yaml b/e2e/yaks/common/kamelet-binding-broker/yaks-config.yaml
index 7be2a2496..3369a0076 100644
--- a/e2e/yaks/common/kamelet-binding-broker/yaks-config.yaml
+++ b/e2e/yaks/common/kamelet-binding-broker/yaks-config.yaml
@@ -21,8 +21,6 @@ config:
pre:
- name: installation
run: |
- kamel install -n $YAKS_NAMESPACE --force --operator-env-vars KAMEL_INSTALL_DEFAULT_KAMELETS=false
-
kubectl apply -f sample-broker.yaml -n $YAKS_NAMESPACE
kubectl apply -f timer-source.kamelet.yaml -n $YAKS_NAMESPACE
kubectl apply -f logger-sink.kamelet.yaml -n $YAKS_NAMESPACE
diff --git a/e2e/yaks/common/kamelet-binding-http/yaks-config.yaml b/e2e/yaks/common/kamelet-binding-http/yaks-config.yaml
index 0eb13b5a0..1922bf7bb 100644
--- a/e2e/yaks/common/kamelet-binding-http/yaks-config.yaml
+++ b/e2e/yaks/common/kamelet-binding-http/yaks-config.yaml
@@ -21,8 +21,6 @@ config:
pre:
- name: installation
run: |
- kamel install -n $YAKS_NAMESPACE --force --operator-env-vars KAMEL_INSTALL_DEFAULT_KAMELETS=false
-
kubectl apply -f timer-source.kamelet.yaml -n $YAKS_NAMESPACE
kamel run display.groovy -w -n $YAKS_NAMESPACE
diff --git a/e2e/yaks/common/kamelet-binding-property-encoding/yaks-config.yaml b/e2e/yaks/common/kamelet-binding-property-encoding/yaks-config.yaml
index 3efa5ee15..602e8a9d9 100644
--- a/e2e/yaks/common/kamelet-binding-property-encoding/yaks-config.yaml
+++ b/e2e/yaks/common/kamelet-binding-property-encoding/yaks-config.yaml
@@ -21,8 +21,6 @@ config:
pre:
- name: installation
run: |
- kamel install -n $YAKS_NAMESPACE --force --operator-env-vars KAMEL_INSTALL_DEFAULT_KAMELETS=false
-
kubectl apply -f timer-source.kamelet.yaml -n $YAKS_NAMESPACE
kubectl apply -f properties-binding.yaml -n $YAKS_NAMESPACE
post:
diff --git a/e2e/yaks/common/kamelet-binding/yaks-config.yaml b/e2e/yaks/common/kamelet-binding/yaks-config.yaml
index 58f529385..b236c3435 100644
--- a/e2e/yaks/common/kamelet-binding/yaks-config.yaml
+++ b/e2e/yaks/common/kamelet-binding/yaks-config.yaml
@@ -21,8 +21,6 @@ config:
pre:
- name: installation
run: |
- kamel install -n $YAKS_NAMESPACE --force --operator-env-vars KAMEL_INSTALL_DEFAULT_KAMELETS=false
-
kubectl apply -f messages-channel.yaml -n $YAKS_NAMESPACE
kubectl apply -f timer-source.kamelet.yaml -n $YAKS_NAMESPACE
diff --git a/e2e/yaks/common/kamelet-no-properties/yaks-config.yaml b/e2e/yaks/common/kamelet-no-properties/yaks-config.yaml
index 0848b4b3f..cd754db64 100644
--- a/e2e/yaks/common/kamelet-no-properties/yaks-config.yaml
+++ b/e2e/yaks/common/kamelet-no-properties/yaks-config.yaml
@@ -18,10 +18,6 @@
config:
namespace:
temporary: true
-pre:
-- name: installation
- run: |
- kamel install -n $YAKS_NAMESPACE --force
post:
- name: print dump
if: env:CI=true && failure()
diff --git a/e2e/yaks/common/kamelet-steps/yaks-config.yaml b/e2e/yaks/common/kamelet-steps/yaks-config.yaml
index 04a18d74c..2314a59fb 100644
--- a/e2e/yaks/common/kamelet-steps/yaks-config.yaml
+++ b/e2e/yaks/common/kamelet-steps/yaks-config.yaml
@@ -21,8 +21,6 @@ config:
pre:
- name: installation
run: |
- kamel install -n $YAKS_NAMESPACE --force --operator-env-vars KAMEL_INSTALL_DEFAULT_KAMELETS=false
-
kubectl apply -f timer-source.kamelet.yaml -n $YAKS_NAMESPACE
kubectl apply -f prefix-action.kamelet.yaml -n $YAKS_NAMESPACE
kubectl apply -f steps-binding.yaml -n $YAKS_NAMESPACE
diff --git a/e2e/yaks/common/kamelet/yaks-config.yaml b/e2e/yaks/common/kamelet/yaks-config.yaml
index 51c3bcd1a..6312e7824 100644
--- a/e2e/yaks/common/kamelet/yaks-config.yaml
+++ b/e2e/yaks/common/kamelet/yaks-config.yaml
@@ -21,8 +21,6 @@ config:
pre:
- name: installation
run: |
- kamel install -n $YAKS_NAMESPACE --operator-env-vars KAMEL_INSTALL_DEFAULT_KAMELETS=false --force
-
kubectl apply -f timer-source.kamelet.yaml -n $YAKS_NAMESPACE
kubectl apply -f echo-sink.kamelet.yaml -n $YAKS_NAMESPACE
diff --git a/e2e/yaks/common/knative-broker/yaks-config.yaml b/e2e/yaks/common/knative-broker/yaks-config.yaml
index 0848b4b3f..cd754db64 100644
--- a/e2e/yaks/common/knative-broker/yaks-config.yaml
+++ b/e2e/yaks/common/knative-broker/yaks-config.yaml
@@ -18,10 +18,6 @@
config:
namespace:
temporary: true
-pre:
-- name: installation
- run: |
- kamel install -n $YAKS_NAMESPACE --force
post:
- name: print dump
if: env:CI=true && failure()
diff --git a/e2e/yaks/common/knative-sinkbinding/yaks-config.yaml b/e2e/yaks/common/knative-sinkbinding/yaks-config.yaml
index deea4a8e5..a6cc09546 100644
--- a/e2e/yaks/common/knative-sinkbinding/yaks-config.yaml
+++ b/e2e/yaks/common/knative-sinkbinding/yaks-config.yaml
@@ -21,8 +21,6 @@ config:
pre:
- name: installation
run: |
- kamel install -n $YAKS_NAMESPACE --force
-
kubectl apply -n $YAKS_NAMESPACE -f messages-channel.yaml
kamel run receiver.groovy -w -n $YAKS_NAMESPACE
diff --git a/e2e/yaks/openshift/monitoring/yaks-config.yaml b/e2e/yaks/openshift/monitoring/yaks-config.yaml
index b29f76bf4..5a42af3a8 100644
--- a/e2e/yaks/openshift/monitoring/yaks-config.yaml
+++ b/e2e/yaks/openshift/monitoring/yaks-config.yaml
@@ -21,9 +21,6 @@ config:
pre:
- name: ObtainToken
script: ./obtainToken.sh
- - name: Camel-k install
- run: |
- kamel install -w -n ${YAKS_NAMESPACE}
- name: Setup monitoring resources
script: ./monitoringResources.sh
- name: Dependency install
@@ -32,4 +29,4 @@ pre:
run: |
set +e
kamel run --name metrics Metrics.java -w -n $YAKS_NAMESPACE --dependency mvn:com.github.openshift-integration:camel-k-example-metrics-non-existing:1.0.0-SNAPSHOT
- kamel run --name metrics Metrics.java -w -n $YAKS_NAMESPACE --dependency mvn:com.github.openshift-integration:camel-k-example-metrics:1.0.0-SNAPSHOT
\ No newline at end of file
+ kamel run --name metrics Metrics.java -w -n $YAKS_NAMESPACE --dependency mvn:com.github.openshift-integration:camel-k-example-metrics:1.0.0-SNAPSHOT