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 2020/10/06 08:03:14 UTC
[camel-k] 03/08: chore(e2e): refactor tests to run all them
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 7fea5bf492330db0e6edd3eb53005b81b8a462ef
Author: nicolaferraro <ni...@gmail.com>
AuthorDate: Fri Oct 2 17:32:49 2020 +0200
chore(e2e): refactor tests to run all them
---
.github/workflows/knative.yml | 3 +--
deploy/resources.go | 4 ++--
e2e/yaks/{ => common}/kamelet-binding/display.groovy | 0
e2e/yaks/{ => common}/kamelet-binding/kamelet.feature | 0
e2e/yaks/{ => common}/kamelet-binding/logger-sink-binding.yaml | 0
e2e/yaks/{ => common}/kamelet-binding/logger-sink.kamelet.yaml | 0
.../kamelet-binding}/messages-channel.yaml | 0
.../{ => common}/kamelet-binding/timer-source-binding-display.yaml | 0
e2e/yaks/{ => common}/kamelet-binding/timer-source-binding.yaml | 0
.../{kamelet => common/kamelet-binding}/timer-source.kamelet.yaml | 0
e2e/yaks/{ => common}/kamelet-binding/yaks-config.yaml | 0
e2e/yaks/{ => common}/kamelet/echo-sink.kamelet.yaml | 0
e2e/yaks/{ => common}/kamelet/kamelet.feature | 0
e2e/yaks/{ => common}/kamelet/source-sink.groovy | 0
.../{kamelet-binding => common/kamelet}/timer-source.kamelet.yaml | 0
e2e/yaks/{ => common}/kamelet/yaks-config.yaml | 0
.../knative-sinkbinding}/messages-channel.yaml | 0
e2e/yaks/{ => common}/knative-sinkbinding/receiver.groovy | 0
e2e/yaks/{ => common}/knative-sinkbinding/sinkbinding.feature | 0
e2e/yaks/{ => common}/knative-sinkbinding/source.yaml | 0
e2e/yaks/{ => common}/knative-sinkbinding/yaks-config.yaml | 0
e2e/yaks/{ => common}/knative/receiver.groovy | 0
e2e/yaks/{ => common}/knative/source.yaml | 0
e2e/yaks/{ => common}/knative/sources.feature | 0
e2e/yaks/{ => common}/knative/yaks-config.yaml | 0
e2e/yaks/{ => common}/yaks-config.yaml | 0
e2e/yaks/{ => openshift}/monitoring/Metrics.java | 0
e2e/yaks/{ => openshift}/monitoring/app/pom.xml | 0
.../app/src/main/java/org/apache/camel/integration/Service.java | 0
e2e/yaks/{ => openshift}/monitoring/metrics.feature | 0
e2e/yaks/{ => openshift}/monitoring/obtainToken.sh | 0
e2e/yaks/{ => openshift}/monitoring/yaks-config.yaml | 0
e2e/yaks/{ => openshift}/yaks-config.yaml | 0
33 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/knative.yml b/.github/workflows/knative.yml
index e27f1e1..4e01d19 100644
--- a/.github/workflows/knative.yml
+++ b/.github/workflows/knative.yml
@@ -333,5 +333,4 @@ jobs:
export CAMEL_K_TEST_IMAGE_NAME=${CAMEL_K_REGISTRY}:5000/apache/camel-k
export CAMEL_K_TEST_IMAGE_VERSION=$(make version)
- yaks test e2e/yaks/knative
- yaks test e2e/yaks/knative-sinkbinding
+ yaks test e2e/yaks/common
diff --git a/deploy/resources.go b/deploy/resources.go
index 3f1fabd..b6c4ef3 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -147,9 +147,9 @@ var assets = func() http.FileSystem {
"/crd-kamelet-binding.yaml": &vfsgen۰CompressedFileInfo{
name: "crd-kamelet-binding.yaml",
modTime: time.Time{},
- uncompressedSize: 13060,
+ uncompressedSize: 14596,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5b\x4d\x73\xe3\x36\xd2\xbe\xf3\x57\x74\x49\x87\xcc\x54\x59\x94\xc7\xf9\xa8\x44\xef\x49\xb1\x67\xea\xd5\x8e\xd7\x76\x59\x72\x52\x39\x82\x64\x8b\xc2\x0a\x04\xb8\x00\x68\x8d\xb2\xb5\xff\x7d\x0b\x0d\x92\xa2\x24\x92\xd2\xd8\x93\xca\xc5\x3c\x59\x04\xd0\xe8\xef\x7e\xd0\x84\x87\x30\xfa\x76\x4f\x30\x84\x5b\x1e\xa3\x34\x98\x80\x55\x60\x57\x08\xd3\x9c\xc5\x2b\x84\xb9\x5a\xda\x0d\xd3\x08\x9f\x54\x21\x13\x66\xb9\x92\xf0\x6e\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5b\x5f\x73\xdb\x36\x12\x7f\xd7\xa7\xd8\xb1\x1e\x92\xcc\x58\x94\xe3\x5e\x3b\xad\xee\xc9\x75\x92\x3b\x5d\x72\x76\xc6\x52\xda\xe9\x74\xfa\x00\x91\x2b\x09\x27\x10\xe0\x01\xa0\x64\x5d\xa7\xdf\xfd\x66\x17\x24\x45\x49\x24\xad\xd8\x49\xfb\x62\xbe\xd8\x22\xc1\xc5\xfe\xc3\xee\x0f\xbb\x60\x1f\x06\x5f\xee\xea\xf5\xe1\x83\x8c\x51\x3b\x4c\xc0\x1b\xf0\x4b\x84\xab\x4c\xc4\x4b\x84\x89\x99\xfb\x8d\xb0\x08\xef\x4c\xae\x13\xe1\xa5\x [...]
},
"/crd-kamelet.yaml": &vfsgen۰CompressedFileInfo{
name: "crd-kamelet.yaml",
diff --git a/e2e/yaks/kamelet-binding/display.groovy b/e2e/yaks/common/kamelet-binding/display.groovy
similarity index 100%
rename from e2e/yaks/kamelet-binding/display.groovy
rename to e2e/yaks/common/kamelet-binding/display.groovy
diff --git a/e2e/yaks/kamelet-binding/kamelet.feature b/e2e/yaks/common/kamelet-binding/kamelet.feature
similarity index 100%
rename from e2e/yaks/kamelet-binding/kamelet.feature
rename to e2e/yaks/common/kamelet-binding/kamelet.feature
diff --git a/e2e/yaks/kamelet-binding/logger-sink-binding.yaml b/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
similarity index 100%
rename from e2e/yaks/kamelet-binding/logger-sink-binding.yaml
rename to e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
diff --git a/e2e/yaks/kamelet-binding/logger-sink.kamelet.yaml b/e2e/yaks/common/kamelet-binding/logger-sink.kamelet.yaml
similarity index 100%
rename from e2e/yaks/kamelet-binding/logger-sink.kamelet.yaml
rename to e2e/yaks/common/kamelet-binding/logger-sink.kamelet.yaml
diff --git a/e2e/yaks/knative-sinkbinding/messages-channel.yaml b/e2e/yaks/common/kamelet-binding/messages-channel.yaml
similarity index 100%
rename from e2e/yaks/knative-sinkbinding/messages-channel.yaml
rename to e2e/yaks/common/kamelet-binding/messages-channel.yaml
diff --git a/e2e/yaks/kamelet-binding/timer-source-binding-display.yaml b/e2e/yaks/common/kamelet-binding/timer-source-binding-display.yaml
similarity index 100%
rename from e2e/yaks/kamelet-binding/timer-source-binding-display.yaml
rename to e2e/yaks/common/kamelet-binding/timer-source-binding-display.yaml
diff --git a/e2e/yaks/kamelet-binding/timer-source-binding.yaml b/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
similarity index 100%
rename from e2e/yaks/kamelet-binding/timer-source-binding.yaml
rename to e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
diff --git a/e2e/yaks/kamelet/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-binding/timer-source.kamelet.yaml
similarity index 100%
rename from e2e/yaks/kamelet/timer-source.kamelet.yaml
rename to e2e/yaks/common/kamelet-binding/timer-source.kamelet.yaml
diff --git a/e2e/yaks/kamelet-binding/yaks-config.yaml b/e2e/yaks/common/kamelet-binding/yaks-config.yaml
similarity index 100%
rename from e2e/yaks/kamelet-binding/yaks-config.yaml
rename to e2e/yaks/common/kamelet-binding/yaks-config.yaml
diff --git a/e2e/yaks/kamelet/echo-sink.kamelet.yaml b/e2e/yaks/common/kamelet/echo-sink.kamelet.yaml
similarity index 100%
rename from e2e/yaks/kamelet/echo-sink.kamelet.yaml
rename to e2e/yaks/common/kamelet/echo-sink.kamelet.yaml
diff --git a/e2e/yaks/kamelet/kamelet.feature b/e2e/yaks/common/kamelet/kamelet.feature
similarity index 100%
rename from e2e/yaks/kamelet/kamelet.feature
rename to e2e/yaks/common/kamelet/kamelet.feature
diff --git a/e2e/yaks/kamelet/source-sink.groovy b/e2e/yaks/common/kamelet/source-sink.groovy
similarity index 100%
rename from e2e/yaks/kamelet/source-sink.groovy
rename to e2e/yaks/common/kamelet/source-sink.groovy
diff --git a/e2e/yaks/kamelet-binding/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet/timer-source.kamelet.yaml
similarity index 100%
rename from e2e/yaks/kamelet-binding/timer-source.kamelet.yaml
rename to e2e/yaks/common/kamelet/timer-source.kamelet.yaml
diff --git a/e2e/yaks/kamelet/yaks-config.yaml b/e2e/yaks/common/kamelet/yaks-config.yaml
similarity index 100%
rename from e2e/yaks/kamelet/yaks-config.yaml
rename to e2e/yaks/common/kamelet/yaks-config.yaml
diff --git a/e2e/yaks/kamelet-binding/messages-channel.yaml b/e2e/yaks/common/knative-sinkbinding/messages-channel.yaml
similarity index 100%
rename from e2e/yaks/kamelet-binding/messages-channel.yaml
rename to e2e/yaks/common/knative-sinkbinding/messages-channel.yaml
diff --git a/e2e/yaks/knative-sinkbinding/receiver.groovy b/e2e/yaks/common/knative-sinkbinding/receiver.groovy
similarity index 100%
rename from e2e/yaks/knative-sinkbinding/receiver.groovy
rename to e2e/yaks/common/knative-sinkbinding/receiver.groovy
diff --git a/e2e/yaks/knative-sinkbinding/sinkbinding.feature b/e2e/yaks/common/knative-sinkbinding/sinkbinding.feature
similarity index 100%
rename from e2e/yaks/knative-sinkbinding/sinkbinding.feature
rename to e2e/yaks/common/knative-sinkbinding/sinkbinding.feature
diff --git a/e2e/yaks/knative-sinkbinding/source.yaml b/e2e/yaks/common/knative-sinkbinding/source.yaml
similarity index 100%
rename from e2e/yaks/knative-sinkbinding/source.yaml
rename to e2e/yaks/common/knative-sinkbinding/source.yaml
diff --git a/e2e/yaks/knative-sinkbinding/yaks-config.yaml b/e2e/yaks/common/knative-sinkbinding/yaks-config.yaml
similarity index 100%
rename from e2e/yaks/knative-sinkbinding/yaks-config.yaml
rename to e2e/yaks/common/knative-sinkbinding/yaks-config.yaml
diff --git a/e2e/yaks/knative/receiver.groovy b/e2e/yaks/common/knative/receiver.groovy
similarity index 100%
rename from e2e/yaks/knative/receiver.groovy
rename to e2e/yaks/common/knative/receiver.groovy
diff --git a/e2e/yaks/knative/source.yaml b/e2e/yaks/common/knative/source.yaml
similarity index 100%
rename from e2e/yaks/knative/source.yaml
rename to e2e/yaks/common/knative/source.yaml
diff --git a/e2e/yaks/knative/sources.feature b/e2e/yaks/common/knative/sources.feature
similarity index 100%
rename from e2e/yaks/knative/sources.feature
rename to e2e/yaks/common/knative/sources.feature
diff --git a/e2e/yaks/knative/yaks-config.yaml b/e2e/yaks/common/knative/yaks-config.yaml
similarity index 100%
rename from e2e/yaks/knative/yaks-config.yaml
rename to e2e/yaks/common/knative/yaks-config.yaml
diff --git a/e2e/yaks/yaks-config.yaml b/e2e/yaks/common/yaks-config.yaml
similarity index 100%
copy from e2e/yaks/yaks-config.yaml
copy to e2e/yaks/common/yaks-config.yaml
diff --git a/e2e/yaks/monitoring/Metrics.java b/e2e/yaks/openshift/monitoring/Metrics.java
similarity index 100%
rename from e2e/yaks/monitoring/Metrics.java
rename to e2e/yaks/openshift/monitoring/Metrics.java
diff --git a/e2e/yaks/monitoring/app/pom.xml b/e2e/yaks/openshift/monitoring/app/pom.xml
similarity index 100%
rename from e2e/yaks/monitoring/app/pom.xml
rename to e2e/yaks/openshift/monitoring/app/pom.xml
diff --git a/e2e/yaks/monitoring/app/src/main/java/org/apache/camel/integration/Service.java b/e2e/yaks/openshift/monitoring/app/src/main/java/org/apache/camel/integration/Service.java
similarity index 100%
rename from e2e/yaks/monitoring/app/src/main/java/org/apache/camel/integration/Service.java
rename to e2e/yaks/openshift/monitoring/app/src/main/java/org/apache/camel/integration/Service.java
diff --git a/e2e/yaks/monitoring/metrics.feature b/e2e/yaks/openshift/monitoring/metrics.feature
similarity index 100%
rename from e2e/yaks/monitoring/metrics.feature
rename to e2e/yaks/openshift/monitoring/metrics.feature
diff --git a/e2e/yaks/monitoring/obtainToken.sh b/e2e/yaks/openshift/monitoring/obtainToken.sh
similarity index 100%
rename from e2e/yaks/monitoring/obtainToken.sh
rename to e2e/yaks/openshift/monitoring/obtainToken.sh
diff --git a/e2e/yaks/monitoring/yaks-config.yaml b/e2e/yaks/openshift/monitoring/yaks-config.yaml
similarity index 100%
rename from e2e/yaks/monitoring/yaks-config.yaml
rename to e2e/yaks/openshift/monitoring/yaks-config.yaml
diff --git a/e2e/yaks/yaks-config.yaml b/e2e/yaks/openshift/yaks-config.yaml
similarity index 100%
rename from e2e/yaks/yaks-config.yaml
rename to e2e/yaks/openshift/yaks-config.yaml