This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit b1dec7f37c5e3e6ab7726a41c469c3b8d208e850
Author: Christoph Deppisch <cdeppi...@redhat.com>
AuthorDate: Thu Dec 1 15:50:32 2022 +0100
Include experimental Kamelets in the catalog
---
.github/workflows/yaks-tests.yaml | 9 ++++-----
.../aws-ddb-experimental-sink.kamelet.yaml | 10 ++++++----
.../aws-s3-experimental-source.kamelet.yaml | 8 +++++---
.../resources/kamelets/aws-ddb-experimental-sink.kamelet.yaml | 10 ++++++----
.../resources/kamelets/aws-s3-experimental-source.kamelet.yaml | 8 +++++---
.../experimental/aws-ddb-sink-exp}/amazonDDBClient.groovy | 0
.../experimental/aws-ddb-sink-exp}/aws-ddb-sink-binding.yaml | 4 ++--
.../aws-ddb-sink-exp}/aws-ddb-sink-deleteItem.feature | 10 +++++-----
.../aws-ddb-sink-exp}/aws-ddb-sink-putItem.feature | 10 +++++-----
.../aws-ddb-sink-exp}/aws-ddb-sink-updateItem.feature | 10 +++++-----
.../experimental/aws-ddb-sink-exp}/putItem.groovy | 0
.../experimental/aws-ddb-sink-exp}/verifyItems.groovy | 0
.../experimental/aws-ddb-sink-exp}/yaks-config.yaml | 4 ----
.../experimental/aws-s3-exp}/amazonS3Client.groovy | 0
.../experimental/aws-s3-exp}/aws-s3-cloudevents.feature | 10 +++++-----
.../experimental/aws-s3-exp}/aws-s3-knative.feature | 10 +++++-----
.../experimental/aws-s3-exp}/aws-s3-to-knative.yaml | 4 ++--
.../aws-s3 => test/experimental/aws-s3-exp}/yaks-config.yaml | 4 ----
18 files changed, 55 insertions(+), 56 deletions(-)
diff --git a/.github/workflows/yaks-tests.yaml
b/.github/workflows/yaks-tests.yaml
index 7f168ca2..a398b1a7 100644
--- a/.github/workflows/yaks-tests.yaml
+++ b/.github/workflows/yaks-tests.yaml
@@ -65,7 +65,6 @@ jobs:
# Overwrite JitPack coordinates in the local Kamelets so the tests can
use the utility classes in this PR
find kamelets -maxdepth 1 -name '*.kamelet.yaml' -exec sed -i
"s/github:apache.camel-kamelets:camel-kamelets-utils:${BASE_REF}-SNAPSHOT/github:${HEAD_REPO/\//.}:camel-kamelets-utils:${HEAD_REF//\//'~'}-SNAPSHOT/g"
{} +
- find experimental -maxdepth 1 -name '*.kamelet.yaml' -exec sed -i
"s/github:apache.camel-kamelets:camel-kamelets-utils:${BASE_REF}-SNAPSHOT/github:${HEAD_REPO/\//.}:camel-kamelets-utils:${HEAD_REF//\//'~'}-SNAPSHOT/g"
{} +
- name: Get Camel K CLI
run: |
curl --fail -L --silent
https://github.com/apache/camel-k/releases/download/v${CAMEL_K_VERSION}/camel-k-client-${CAMEL_K_VERSION}-linux-64bit.tar.gz
-o kamel.tar.gz
@@ -110,7 +109,7 @@ jobs:
yaks install --operator-image $YAKS_IMAGE_NAME:$YAKS_VERSION
- name: YAKS Tests
run: |
- echo "Running tests"
+ echo "Running tests for Kamelets"
yaks run test/aws-ddb-sink $YAKS_RUN_OPTIONS
yaks run test/aws-s3 $YAKS_RUN_OPTIONS
@@ -122,11 +121,11 @@ jobs:
yaks run test/earthquake-source $YAKS_RUN_OPTIONS
yaks run test/rest-openapi-sink $YAKS_RUN_OPTIONS
yaks run test/kafka $YAKS_RUN_OPTIONS
- - name: YAKS Tests on experimental Kamelets
+ - name: YAKS Tests experimental Kamelets
run: |
echo "Running tests for experimental Kamelets"
- yaks run experimental/test/aws-ddb-sink $YAKS_RUN_OPTIONS
- yaks run experimental/test/aws-s3 $YAKS_RUN_OPTIONS
+ yaks run test/experimental/aws-ddb-sink-exp $YAKS_RUN_OPTIONS
+ yaks run test/experimental/aws-s3-exp $YAKS_RUN_OPTIONS
- name: YAKS Report
if: failure()
run: |
diff --git a/experimental/aws-ddb-sink.exp.kamelet.yaml
b/kamelets/aws-ddb-experimental-sink.kamelet.yaml
similarity index 95%
copy from experimental/aws-ddb-sink.exp.kamelet.yaml
copy to kamelets/aws-ddb-experimental-sink.kamelet.yaml
index e19185fa..a98ecb44 100644
--- a/experimental/aws-ddb-sink.exp.kamelet.yaml
+++ b/kamelets/aws-ddb-experimental-sink.kamelet.yaml
@@ -18,9 +18,9 @@
apiVersion: camel.apache.org/v1alpha1
kind: Kamelet
metadata:
- name: aws-ddb-sink-experimental
+ name: aws-ddb-experimental-sink
annotations:
- camel.apache.org/kamelet.support.level: "Experiemental"
+ camel.apache.org/kamelet.support.level: "Experimental"
camel.apache.org/catalog.version: "main-SNAPSHOT"
camel.apache.org/kamelet.icon:
"data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjEwMCIgd2lkdGg9IjEwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBmaWxsPSIjMkQ3MkI4IiBkPSJNNzQuMTc0IDMxLjgwN2w3LjQzNyA1LjM2N3YtNy42MDJsLTcuNDgtOC43NjV2MTAuOTU3bC4wNDMuMDE1eiIvPjxwYXRoIGZpbGw9IiM1Mjk0Q0YiIGQ9Ik01OS44MzggODUuNjY2bDE0LjI5My03LjE0NlYyMC43OTFsLTE0LjMwMy03LjEyNHoiLz48cGF0aCBmaWxsPSIjMjA1Qjk4IiBkPSJNMzkuNDk2IDg1LjY2NkwyNS4yMDMgNzguNTJWMjAuNzkxbDE0LjMwMy03LjEyNHoiLz48cGF0aCBmaWxsPSIjMkQ3Mk
[...]
camel.apache.org/provider: "Apache Software Foundation"
@@ -29,7 +29,7 @@ metadata:
camel.apache.org/kamelet.type: "sink"
spec:
definition:
- title: "AWS DynamoDB Sink"
+ title: "AWS DynamoDB Experimental Sink"
description: |-
Send data to Amazon DynamoDB. The sent data inserts, updates, or deletes
an item on the specified AWS DynamoDB table.
@@ -37,7 +37,9 @@ spec:
If you use the default credentials provider, the DynamoDB client loads
the credentials through this provider and doesn't use the basic authentication
method.
- This Kamelet expects a JSON-formatted body and it must include the
primary key values that define the DynamoDB item. The mapping between the JSON
fields and table attribute values is done by key. For example, for
'{"username":"oscerd", "city":"Rome"}' input, the Kamelet inserts or update an
item in the specified AWS DynamoDB table and sets the values for the 'username'
and 'city' attributes.
+ This Kamelet expects a JSON-formatted body and it must include the
primary key values that define the DynamoDB item. The mapping between the JSON
fields and table attribute values is done by key. For example, for
'{"username":"oscerd", "city":"Rome"}' input, the Kamelet inserts or update an
item in the specified AWS DynamoDB table and sets the values for the 'username'
and 'city' attributes.
+
+ This Kamelet supports experimental input format to specify the data type
that that is given to this sink. The Kamelet will do best effort to convert the
provided input type to the required input for the sink.
required:
- table
- region
diff --git a/experimental/aws-s3-source.exp.kamelet.yaml
b/kamelets/aws-s3-experimental-source.kamelet.yaml
similarity index 96%
copy from experimental/aws-s3-source.exp.kamelet.yaml
copy to kamelets/aws-s3-experimental-source.kamelet.yaml
index 7a8d8fe5..504157c1 100644
--- a/experimental/aws-s3-source.exp.kamelet.yaml
+++ b/kamelets/aws-s3-experimental-source.kamelet.yaml
@@ -1,7 +1,7 @@
apiVersion: camel.apache.org/v1alpha1
kind: Kamelet
metadata:
- name: aws-s3-source-experimental
+ name: aws-s3-experimental-source
annotations:
camel.apache.org/kamelet.support.level: "Experimental"
camel.apache.org/catalog.version: "main-SNAPSHOT"
@@ -12,7 +12,7 @@ metadata:
camel.apache.org/kamelet.type: "source"
spec:
definition:
- title: "AWS S3 Source"
+ title: "AWS S3 Experimental Source"
description: |-
Receive data from an Amazon S3 Bucket.
@@ -20,7 +20,9 @@ spec:
If you use the default credentials provider, the S3 client loads the
credentials through this provider and doesn't use the basic authentication
method.
- Two headers will be duplicated with different names for clarity at sink
level, CamelAwsS3Key will be duplicated into aws.s3.key and
CamelAwsS3BucketName will be duplicated in aws.s3.bucket.name
+ Two headers will be duplicated with different names for clarity at sink
level, CamelAwsS3Key will be duplicated into aws.s3.key and
CamelAwsS3BucketName will be duplicated in aws.s3.bucket.name.
+
+ This Kamelet supports experimental output format to specify the data
type produced by this source. Users of the Kamelet are able to choose from
different output types.
required:
- bucketNameOrArn
- region
diff --git a/experimental/aws-ddb-sink.exp.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/aws-ddb-experimental-sink.kamelet.yaml
similarity index 95%
rename from experimental/aws-ddb-sink.exp.kamelet.yaml
rename to
library/camel-kamelets/src/main/resources/kamelets/aws-ddb-experimental-sink.kamelet.yaml
index e19185fa..a98ecb44 100644
--- a/experimental/aws-ddb-sink.exp.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/aws-ddb-experimental-sink.kamelet.yaml
@@ -18,9 +18,9 @@
apiVersion: camel.apache.org/v1alpha1
kind: Kamelet
metadata:
- name: aws-ddb-sink-experimental
+ name: aws-ddb-experimental-sink
annotations:
- camel.apache.org/kamelet.support.level: "Experiemental"
+ camel.apache.org/kamelet.support.level: "Experimental"
camel.apache.org/catalog.version: "main-SNAPSHOT"
camel.apache.org/kamelet.icon:
"data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjEwMCIgd2lkdGg9IjEwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBmaWxsPSIjMkQ3MkI4IiBkPSJNNzQuMTc0IDMxLjgwN2w3LjQzNyA1LjM2N3YtNy42MDJsLTcuNDgtOC43NjV2MTAuOTU3bC4wNDMuMDE1eiIvPjxwYXRoIGZpbGw9IiM1Mjk0Q0YiIGQ9Ik01OS44MzggODUuNjY2bDE0LjI5My03LjE0NlYyMC43OTFsLTE0LjMwMy03LjEyNHoiLz48cGF0aCBmaWxsPSIjMjA1Qjk4IiBkPSJNMzkuNDk2IDg1LjY2NkwyNS4yMDMgNzguNTJWMjAuNzkxbDE0LjMwMy03LjEyNHoiLz48cGF0aCBmaWxsPSIjMkQ3Mk
[...]
camel.apache.org/provider: "Apache Software Foundation"
@@ -29,7 +29,7 @@ metadata:
camel.apache.org/kamelet.type: "sink"
spec:
definition:
- title: "AWS DynamoDB Sink"
+ title: "AWS DynamoDB Experimental Sink"
description: |-
Send data to Amazon DynamoDB. The sent data inserts, updates, or deletes
an item on the specified AWS DynamoDB table.
@@ -37,7 +37,9 @@ spec:
If you use the default credentials provider, the DynamoDB client loads
the credentials through this provider and doesn't use the basic authentication
method.
- This Kamelet expects a JSON-formatted body and it must include the
primary key values that define the DynamoDB item. The mapping between the JSON
fields and table attribute values is done by key. For example, for
'{"username":"oscerd", "city":"Rome"}' input, the Kamelet inserts or update an
item in the specified AWS DynamoDB table and sets the values for the 'username'
and 'city' attributes.
+ This Kamelet expects a JSON-formatted body and it must include the
primary key values that define the DynamoDB item. The mapping between the JSON
fields and table attribute values is done by key. For example, for
'{"username":"oscerd", "city":"Rome"}' input, the Kamelet inserts or update an
item in the specified AWS DynamoDB table and sets the values for the 'username'
and 'city' attributes.
+
+ This Kamelet supports experimental input format to specify the data type
that that is given to this sink. The Kamelet will do best effort to convert the
provided input type to the required input for the sink.
required:
- table
- region
diff --git a/experimental/aws-s3-source.exp.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-experimental-source.kamelet.yaml
similarity index 96%
rename from experimental/aws-s3-source.exp.kamelet.yaml
rename to
library/camel-kamelets/src/main/resources/kamelets/aws-s3-experimental-source.kamelet.yaml
index 7a8d8fe5..504157c1 100644
--- a/experimental/aws-s3-source.exp.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-experimental-source.kamelet.yaml
@@ -1,7 +1,7 @@
apiVersion: camel.apache.org/v1alpha1
kind: Kamelet
metadata:
- name: aws-s3-source-experimental
+ name: aws-s3-experimental-source
annotations:
camel.apache.org/kamelet.support.level: "Experimental"
camel.apache.org/catalog.version: "main-SNAPSHOT"
@@ -12,7 +12,7 @@ metadata:
camel.apache.org/kamelet.type: "source"
spec:
definition:
- title: "AWS S3 Source"
+ title: "AWS S3 Experimental Source"
description: |-
Receive data from an Amazon S3 Bucket.
@@ -20,7 +20,9 @@ spec:
If you use the default credentials provider, the S3 client loads the
credentials through this provider and doesn't use the basic authentication
method.
- Two headers will be duplicated with different names for clarity at sink
level, CamelAwsS3Key will be duplicated into aws.s3.key and
CamelAwsS3BucketName will be duplicated in aws.s3.bucket.name
+ Two headers will be duplicated with different names for clarity at sink
level, CamelAwsS3Key will be duplicated into aws.s3.key and
CamelAwsS3BucketName will be duplicated in aws.s3.bucket.name.
+
+ This Kamelet supports experimental output format to specify the data
type produced by this source. Users of the Kamelet are able to choose from
different output types.
required:
- bucketNameOrArn
- region
diff --git a/experimental/test/aws-ddb-sink/amazonDDBClient.groovy
b/test/experimental/aws-ddb-sink-exp/amazonDDBClient.groovy
similarity index 100%
rename from experimental/test/aws-ddb-sink/amazonDDBClient.groovy
rename to test/experimental/aws-ddb-sink-exp/amazonDDBClient.groovy
diff --git a/experimental/test/aws-ddb-sink/aws-ddb-sink-binding.yaml
b/test/experimental/aws-ddb-sink-exp/aws-ddb-sink-binding.yaml
similarity index 95%
rename from experimental/test/aws-ddb-sink/aws-ddb-sink-binding.yaml
rename to test/experimental/aws-ddb-sink-exp/aws-ddb-sink-binding.yaml
index 6b4b2b02..d1e5fb44 100644
--- a/experimental/test/aws-ddb-sink/aws-ddb-sink-binding.yaml
+++ b/test/experimental/aws-ddb-sink-exp/aws-ddb-sink-binding.yaml
@@ -18,7 +18,7 @@
apiVersion: camel.apache.org/v1alpha1
kind: KameletBinding
metadata:
- name: aws-ddb-sink-binding
+ name: aws-ddb-experimental-sink-binding
spec:
source:
ref:
@@ -39,7 +39,7 @@ spec:
ref:
kind: Kamelet
apiVersion: camel.apache.org/v1alpha1
- name: aws-ddb-sink-experimental
+ name: aws-ddb-experimental-sink
properties:
table: ${aws.ddb.tableName}
operation: ${aws.ddb.operation}
diff --git a/experimental/test/aws-ddb-sink/aws-ddb-sink-deleteItem.feature
b/test/experimental/aws-ddb-sink-exp/aws-ddb-sink-deleteItem.feature
similarity index 87%
rename from experimental/test/aws-ddb-sink/aws-ddb-sink-deleteItem.feature
rename to test/experimental/aws-ddb-sink-exp/aws-ddb-sink-deleteItem.feature
index 6c54fdc3..d535b82f 100644
--- a/experimental/test/aws-ddb-sink/aws-ddb-sink-deleteItem.feature
+++ b/test/experimental/aws-ddb-sink-exp/aws-ddb-sink-deleteItem.feature
@@ -18,7 +18,7 @@
Feature: AWS DDB Sink - DeleteItem
Background:
- Given Kamelet aws-ddb-sink-experimental is available
+ Given Kamelet aws-ddb-experimental-sink is available
Given Camel K resource polling configuration
| maxAttempts | 200 |
| delayBetweenAttempts | 2000 |
@@ -48,9 +48,9 @@ Feature: AWS DDB Sink - DeleteItem
Scenario: Create AWS-DDB Kamelet sink binding
When load KameletBinding aws-ddb-sink-binding.yaml
- And KameletBinding aws-ddb-sink-binding is available
- And Camel K integration aws-ddb-sink-binding is running
- And Camel K integration aws-ddb-sink-binding should print Routes startup
+ And KameletBinding aws-ddb-experimental-sink-binding is available
+ And Camel K integration aws-ddb-experimental-sink-binding is running
+ And Camel K integration aws-ddb-experimental-sink-binding should print
Routes startup
Then sleep 10sec
Scenario: Verify Kamelet sink
@@ -59,7 +59,7 @@ Feature: AWS DDB Sink - DeleteItem
Then run script verifyItems.groovy
Scenario: Remove Camel K resources
- Given delete KameletBinding aws-ddb-sink-binding
+ Given delete KameletBinding aws-ddb-experimental-sink-binding
Scenario: Stop container
Given stop LocalStack container
diff --git a/experimental/test/aws-ddb-sink/aws-ddb-sink-putItem.feature
b/test/experimental/aws-ddb-sink-exp/aws-ddb-sink-putItem.feature
similarity index 86%
rename from experimental/test/aws-ddb-sink/aws-ddb-sink-putItem.feature
rename to test/experimental/aws-ddb-sink-exp/aws-ddb-sink-putItem.feature
index f117889b..637b1dab 100644
--- a/experimental/test/aws-ddb-sink/aws-ddb-sink-putItem.feature
+++ b/test/experimental/aws-ddb-sink-exp/aws-ddb-sink-putItem.feature
@@ -18,7 +18,7 @@
Feature: AWS DDB Sink - PutItem
Background:
- Given Kamelet aws-ddb-sink-experimental is available
+ Given Kamelet aws-ddb-experimental-sink is available
Given Camel K resource polling configuration
| maxAttempts | 200 |
| delayBetweenAttempts | 2000 |
@@ -43,16 +43,16 @@ Feature: AWS DDB Sink - PutItem
Scenario: Create AWS-DDB Kamelet sink binding
When load KameletBinding aws-ddb-sink-binding.yaml
- And KameletBinding aws-ddb-sink-binding is available
- And Camel K integration aws-ddb-sink-binding is running
- And Camel K integration aws-ddb-sink-binding should print Routes startup
+ And KameletBinding aws-ddb-experimental-sink-binding is available
+ And Camel K integration aws-ddb-experimental-sink-binding is running
+ And Camel K integration aws-ddb-experimental-sink-binding should print
Routes startup
Then sleep 10sec
Scenario: Verify Kamelet sink
Then run script verifyItems.groovy
Scenario: Remove Camel K resources
- Given delete KameletBinding aws-ddb-sink-binding
+ Given delete KameletBinding aws-ddb-experimental-sink-binding
Scenario: Stop container
Given stop LocalStack container
diff --git a/experimental/test/aws-ddb-sink/aws-ddb-sink-updateItem.feature
b/test/experimental/aws-ddb-sink-exp/aws-ddb-sink-updateItem.feature
similarity index 89%
rename from experimental/test/aws-ddb-sink/aws-ddb-sink-updateItem.feature
rename to test/experimental/aws-ddb-sink-exp/aws-ddb-sink-updateItem.feature
index 215adbe2..5a0a29c1 100644
--- a/experimental/test/aws-ddb-sink/aws-ddb-sink-updateItem.feature
+++ b/test/experimental/aws-ddb-sink-exp/aws-ddb-sink-updateItem.feature
@@ -18,7 +18,7 @@
Feature: AWS DDB Sink - UpdateItem
Background:
- Given Kamelet aws-ddb-sink-experimental is available
+ Given Kamelet aws-ddb-experimental-sink is available
Given Camel K resource polling configuration
| maxAttempts | 200 |
| delayBetweenAttempts | 2000 |
@@ -50,9 +50,9 @@ Feature: AWS DDB Sink - UpdateItem
Scenario: Create AWS-DDB Kamelet sink binding
When load KameletBinding aws-ddb-sink-binding.yaml
- And KameletBinding aws-ddb-sink-binding is available
- And Camel K integration aws-ddb-sink-binding is running
- And Camel K integration aws-ddb-sink-binding should print Routes startup
+ And KameletBinding aws-ddb-experimental-sink-binding is available
+ And Camel K integration aws-ddb-experimental-sink-binding is running
+ And Camel K integration aws-ddb-experimental-sink-binding should print
Routes startup
Then sleep 10sec
Scenario: Verify Kamelet sink
@@ -62,7 +62,7 @@ Feature: AWS DDB Sink - UpdateItem
Then run script verifyItems.groovy
Scenario: Remove Camel K resources
- Given delete KameletBinding aws-ddb-sink-binding
+ Given delete KameletBinding aws-ddb-experimental-sink-binding
Scenario: Stop container
Given stop LocalStack container
diff --git a/experimental/test/aws-ddb-sink/putItem.groovy
b/test/experimental/aws-ddb-sink-exp/putItem.groovy
similarity index 100%
rename from experimental/test/aws-ddb-sink/putItem.groovy
rename to test/experimental/aws-ddb-sink-exp/putItem.groovy
diff --git a/experimental/test/aws-ddb-sink/verifyItems.groovy
b/test/experimental/aws-ddb-sink-exp/verifyItems.groovy
similarity index 100%
rename from experimental/test/aws-ddb-sink/verifyItems.groovy
rename to test/experimental/aws-ddb-sink-exp/verifyItems.groovy
diff --git a/experimental/test/aws-ddb-sink/yaks-config.yaml
b/test/experimental/aws-ddb-sink-exp/yaks-config.yaml
similarity index 93%
rename from experimental/test/aws-ddb-sink/yaks-config.yaml
rename to test/experimental/aws-ddb-sink-exp/yaks-config.yaml
index 51cf3b52..15156f08 100644
--- a/experimental/test/aws-ddb-sink/yaks-config.yaml
+++ b/test/experimental/aws-ddb-sink-exp/yaks-config.yaml
@@ -56,7 +56,3 @@ config:
failedOnly: true
includes:
- app=camel-k
-pre:
- - name: Install experimental Kamelets
- run: |
- kubectl apply -f ../../aws-ddb-sink.exp.kamelet.yaml -n $YAKS_NAMESPACE
diff --git a/experimental/test/aws-s3/amazonS3Client.groovy
b/test/experimental/aws-s3-exp/amazonS3Client.groovy
similarity index 100%
rename from experimental/test/aws-s3/amazonS3Client.groovy
rename to test/experimental/aws-s3-exp/amazonS3Client.groovy
diff --git a/experimental/test/aws-s3/aws-s3-cloudevents.feature
b/test/experimental/aws-s3-exp/aws-s3-cloudevents.feature
similarity index 86%
rename from experimental/test/aws-s3/aws-s3-cloudevents.feature
rename to test/experimental/aws-s3-exp/aws-s3-cloudevents.feature
index 6f5513fc..2ce2d0d6 100644
--- a/experimental/test/aws-s3/aws-s3-cloudevents.feature
+++ b/test/experimental/aws-s3-exp/aws-s3-cloudevents.feature
@@ -3,7 +3,7 @@
Feature: AWS S3 Kamelet - cloud events data type
Background:
- Given Kamelet aws-s3-source-experimental is available
+ Given Kamelet aws-s3-experimental-source is available
Given Knative event consumer timeout is 20000 ms
Given Camel K resource polling configuration
| maxAttempts | 200 |
@@ -30,9 +30,9 @@ Feature: AWS S3 Kamelet - cloud events data type
Scenario: Create AWS-S3 Kamelet to Knative binding
Given variable loginfo is "Installed features"
When load KameletBinding aws-s3-to-knative.yaml
- And KameletBinding aws-s3-to-knative is available
- And Camel K integration aws-s3-to-knative is running
- Then Camel K integration aws-s3-to-knative should print ${loginfo}
+ And KameletBinding aws-s3-to-knative-binding is available
+ And Camel K integration aws-s3-to-knative-binding is running
+ Then Camel K integration aws-s3-to-knative-binding should print ${loginfo}
Scenario: Verify Kamelet source
Given create Knative event consumer service event-consumer-service
@@ -48,7 +48,7 @@ Feature: AWS S3 Kamelet - cloud events data type
| id | @ignore@ |
Scenario: Remove Camel K resources
- Given delete KameletBinding aws-s3-to-knative
+ Given delete KameletBinding aws-s3-to-knative-binding
Given delete Kubernetes service event-consumer-service
Scenario: Stop container
diff --git a/experimental/test/aws-s3/aws-s3-knative.feature
b/test/experimental/aws-s3-exp/aws-s3-knative.feature
similarity index 85%
rename from experimental/test/aws-s3/aws-s3-knative.feature
rename to test/experimental/aws-s3-exp/aws-s3-knative.feature
index 8a6512a9..bb1bebd3 100644
--- a/experimental/test/aws-s3/aws-s3-knative.feature
+++ b/test/experimental/aws-s3-exp/aws-s3-knative.feature
@@ -3,7 +3,7 @@
Feature: AWS S3 Kamelet - Knative binding
Background:
- Given Kamelet aws-s3-source-experimental is available
+ Given Kamelet aws-s3-experimental-source is available
Given Knative event consumer timeout is 20000 ms
Given Camel K resource polling configuration
| maxAttempts | 200 |
@@ -30,9 +30,9 @@ Feature: AWS S3 Kamelet - Knative binding
Scenario: Create AWS-S3 Kamelet to Knative binding
Given variable loginfo is "Installed features"
When load KameletBinding aws-s3-to-knative.yaml
- And KameletBinding aws-s3-to-knative is available
- And Camel K integration aws-s3-to-knative is running
- Then Camel K integration aws-s3-to-knative should print ${loginfo}
+ And KameletBinding aws-s3-to-knative-binding is available
+ And Camel K integration aws-s3-to-knative-binding is running
+ Then Camel K integration aws-s3-to-knative-binding should print ${loginfo}
Scenario: Verify Kamelet source
Given create Knative event consumer service event-consumer-service
@@ -47,7 +47,7 @@ Feature: AWS S3 Kamelet - Knative binding
| id | @ignore@ |
Scenario: Remove Camel K resources
- Given delete KameletBinding aws-s3-to-knative
+ Given delete KameletBinding aws-s3-to-knative-binding
Given delete Kubernetes service event-consumer-service
Given delete Knative broker default
diff --git a/experimental/test/aws-s3/aws-s3-to-knative.yaml
b/test/experimental/aws-s3-exp/aws-s3-to-knative.yaml
similarity index 95%
rename from experimental/test/aws-s3/aws-s3-to-knative.yaml
rename to test/experimental/aws-s3-exp/aws-s3-to-knative.yaml
index afa1b572..117c3332 100644
--- a/experimental/test/aws-s3/aws-s3-to-knative.yaml
+++ b/test/experimental/aws-s3-exp/aws-s3-to-knative.yaml
@@ -18,13 +18,13 @@
apiVersion: camel.apache.org/v1alpha1
kind: KameletBinding
metadata:
- name: aws-s3-to-knative
+ name: aws-s3-to-knative-binding
spec:
source:
ref:
kind: Kamelet
apiVersion: camel.apache.org/v1alpha1
- name: aws-s3-source-experimental
+ name: aws-s3-experimental-source
properties:
bucketNameOrArn: ${aws.s3.bucketNameOrArn}
overrideEndpoint: true
diff --git a/experimental/test/aws-s3/yaks-config.yaml
b/test/experimental/aws-s3-exp/yaks-config.yaml
similarity index 94%
rename from experimental/test/aws-s3/yaks-config.yaml
rename to test/experimental/aws-s3-exp/yaks-config.yaml
index 6431eaf8..33d55aac 100644
--- a/experimental/test/aws-s3/yaks-config.yaml
+++ b/test/experimental/aws-s3-exp/yaks-config.yaml
@@ -63,7 +63,3 @@ config:
failedOnly: true
includes:
- app=camel-k
-pre:
- - name: Install experimental Kamelets
- run: |
- kubectl apply -f ../../aws-s3-source.exp.kamelet.yaml -n $YAKS_NAMESPACE
