From 7ad47c2f2fae4f37bfb8b8eae2beada34add2a47 Mon Sep 17 00:00:00 2001 From: Antonin Stefanutti Date: Mon, 15 Mar 2021 15:38:12 +0100 Subject: [PATCH 1/2] test: Add e2e/common/cli to common e2e test suite --- script/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/script/Makefile b/script/Makefile index a13bdd2c75..aee8872aad 100644 --- a/script/Makefile +++ b/script/Makefile @@ -147,8 +147,11 @@ test: build go test ./... test-integration: build - STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)" go test -timeout 60m -v ./e2e/common -tags=integration && go test -timeout 60m -v ./e2e/common/languages -tags=integration && go test -timeout 60m -v ./e2e/common/traits -tags=integration - #go test -timeout 60m -v ./e2e/common -tags=integration + STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)" \ + go test -timeout 60m -v ./e2e/common -tags=integration && \ + go test -timeout 60m -v ./e2e/common/cli -tags=integration && \ + go test -timeout 60m -v ./e2e/common/languages -tags=integration && \ + go test -timeout 60m -v ./e2e/common/traits -tags=integration test-knative: build STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)" go test -timeout 60m -v ./e2e/knative -tags=integration From b3e250197355247568734cb771cdb84429046178 Mon Sep 17 00:00:00 2001 From: Antonin Stefanutti Date: Mon, 15 Mar 2021 18:09:22 +0100 Subject: [PATCH 2/2] test: Add missing files to CLI e2e test suite --- .../files/timer-kamelet-usage.groovy | 0 e2e/common/cli/files/yaml.yaml | 28 +++++++++++++++++++ 2 files changed, 28 insertions(+) rename e2e/common/{ => cli}/files/timer-kamelet-usage.groovy (100%) create mode 100644 e2e/common/cli/files/yaml.yaml diff --git a/e2e/common/files/timer-kamelet-usage.groovy b/e2e/common/cli/files/timer-kamelet-usage.groovy similarity index 100% rename from e2e/common/files/timer-kamelet-usage.groovy rename to e2e/common/cli/files/timer-kamelet-usage.groovy diff --git a/e2e/common/cli/files/yaml.yaml b/e2e/common/cli/files/yaml.yaml new file mode 100644 index 0000000000..9ccf652734 --- /dev/null +++ b/e2e/common/cli/files/yaml.yaml @@ -0,0 +1,28 @@ +# --------------------------------------------------------------------------- +# 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. +# --------------------------------------------------------------------------- + +- from: + uri: "timer:yaml" + parameters: + period: "5000" + steps: + - set-header: + name: "m" + constant: "string!" + - set-body: + simple: "Magic${header.m}" + - to: "log:info"