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 2023/09/13 10:46:14 UTC
[camel-k] branch main updated (348666c87 -> a35b7489d)
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 348666c87 fix(e2e): check snapshot version
new 54c8a5f80 fix(e2e): kamelet with tab
new c578e497f fix(trait): remove logging warning
new a35b7489d fix(e2e): temporarily ignore Kotlin DSL
The 3 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:
e2e/common/languages/kotlin_test.go | 2 ++
e2e/common/misc/kamelet_test.go | 2 +-
pkg/trait/logging.go | 4 ++--
pkg/trait/logging_test.go | 4 ++--
4 files changed, 7 insertions(+), 5 deletions(-)
[camel-k] 03/03: fix(e2e): temporarily ignore Kotlin DSL
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 a35b7489d63b9e0a2c4c29a86ccc24d610fecdb5
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed Sep 13 11:02:55 2023 +0200
fix(e2e): temporarily ignore Kotlin DSL
Ref #4738
---
e2e/common/languages/kotlin_test.go | 2 ++
1 file changed, 2 insertions(+)
diff --git a/e2e/common/languages/kotlin_test.go b/e2e/common/languages/kotlin_test.go
index da210afc2..39806fd11 100644
--- a/e2e/common/languages/kotlin_test.go
+++ b/e2e/common/languages/kotlin_test.go
@@ -36,6 +36,8 @@ import (
func TestRunSimpleKotlinExamples(t *testing.T) {
RegisterTestingT(t)
+ t.Skip("Skipping test. See https://github.com/apache/camel-k/issues/4738")
+
t.Run("run kotlin", func(t *testing.T) {
Expect(KamelRunWithID(operatorID, ns, "files/kotlin.kts").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "kotlin"), TestTimeoutLong).Should(Equal(v1.PodRunning))
[camel-k] 02/03: fix(trait): remove logging warning
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 c578e497fb101c809899149742e875e58258a059
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue Sep 12 15:02:19 2023 +0200
fix(trait): remove logging warning
Ref #4709
---
pkg/trait/logging.go | 4 ++--
pkg/trait/logging_test.go | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkg/trait/logging.go b/pkg/trait/logging.go
index 34efbafb6..3e3590b78 100644
--- a/pkg/trait/logging.go
+++ b/pkg/trait/logging.go
@@ -25,8 +25,8 @@ import (
)
const (
+ envVarQuarkusConsoleColor = "QUARKUS_CONSOLE_COLOR"
envVarQuarkusLogLevel = "QUARKUS_LOG_LEVEL"
- envVarQuarkusLogConsoleColor = "QUARKUS_LOG_CONSOLE_COLOR"
envVarQuarkusLogConsoleFormat = "QUARKUS_LOG_CONSOLE_FORMAT"
// nolint: gosec // no sensitive credentials
envVarQuarkusLogConsoleJSON = "QUARKUS_LOG_CONSOLE_JSON"
@@ -73,7 +73,7 @@ func (l loggingTrait) Apply(e *Environment) error {
envvar.SetVal(&e.EnvVars, envVarQuarkusLogConsoleJSON, False)
if pointer.BoolDeref(l.Color, true) {
- envvar.SetVal(&e.EnvVars, envVarQuarkusLogConsoleColor, True)
+ envvar.SetVal(&e.EnvVars, envVarQuarkusConsoleColor, True)
}
}
diff --git a/pkg/trait/logging_test.go b/pkg/trait/logging_test.go
index 288cbfe21..2dad88db3 100644
--- a/pkg/trait/logging_test.go
+++ b/pkg/trait/logging_test.go
@@ -122,7 +122,7 @@ func TestEmptyLoggingTrait(t *testing.T) {
logFormatIsNotDefault := false
for _, e := range env.EnvVars {
- if e.Name == envVarQuarkusLogConsoleColor {
+ if e.Name == envVarQuarkusConsoleColor {
if e.Value == "true" {
quarkusConsoleColor = true
}
@@ -174,7 +174,7 @@ func TestJsonLoggingTrait(t *testing.T) {
logFormatIsNotDefault := false
for _, e := range env.EnvVars {
- if e.Name == envVarQuarkusLogConsoleColor {
+ if e.Name == envVarQuarkusConsoleColor {
if e.Value == "true" {
quarkusConsoleColor = true
}
[camel-k] 01/03: fix(e2e): kamelet with tab
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 54c8a5f80ae244f0a870ff0b0fa845338c050c88
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue Sep 12 14:40:26 2023 +0200
fix(e2e): kamelet with tab
Ref #4709
---
e2e/common/misc/kamelet_test.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/e2e/common/misc/kamelet_test.go b/e2e/common/misc/kamelet_test.go
index 97dd0b8f9..7a720a46b 100644
--- a/e2e/common/misc/kamelet_test.go
+++ b/e2e/common/misc/kamelet_test.go
@@ -106,7 +106,7 @@ spec:
name: "Content-Type"
constant: "{{contentType}}"
- to: kamelet:sink
- `
+`
CreatePlainTextConfigmap(ns, "my-kamelet-cm", cmData)
// Basic