This is an automated email from the ASF dual-hosted git repository.
squakez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new db2793e9d chore(e2e): config test it readiness as first check
db2793e9d is described below
commit db2793e9d66355c4d32f9c01a3441b141418c55f
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Thu Aug 13 08:50:02 2026 +0200
chore(e2e): config test it readiness as first check
---
e2e/common/config/config_test.go | 136 +++++++++++++++++++--------------------
1 file changed, 68 insertions(+), 68 deletions(-)
diff --git a/e2e/common/config/config_test.go b/e2e/common/config/config_test.go
index ef4f07ca9..201aab4e9 100644
--- a/e2e/common/config/config_test.go
+++ b/e2e/common/config/config_test.go
@@ -40,23 +40,23 @@ func TestRunConfigProperties(t *testing.T) {
WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) {
t.Run("Simple property", func(t *testing.T) {
g.Expect(KamelRun(t, ctx, ns,
"./files/property-route.yaml", "-p",
"my.message=test-property").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"property-route", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"property-route"), TestTimeoutShort).Should(ContainSubstring("test-property"))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"property-route", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"property-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"property-route")).Should(ContainSubstring("test-property"))
})
t.Run("Property file", func(t *testing.T) {
g.Expect(KamelRun(t, ctx, ns,
"./files/property-file-route.yaml", "--property",
"file:./files/my.properties").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"property-file-route", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello
world"))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"property-file-route", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"property-file-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"property-file-route")).Should(ContainSubstring("hello world"))
})
t.Run("Property precedence", func(t *testing.T) {
g.Expect(KamelRun(t, ctx, ns,
"./files/property-file-route.yaml", "-p", "my.key.2=universe", "-p",
"file:./files/my.properties").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"property-file-route", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello
universe"))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"property-file-route", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"property-file-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"property-file-route")).Should(ContainSubstring("hello universe"))
})
t.Run("Property from ConfigMap", func(t *testing.T) {
@@ -66,9 +66,9 @@ func TestRunConfigProperties(t *testing.T) {
g.Expect(err).To(BeNil())
g.Expect(KamelRun(t, ctx, ns,
"./files/property-route.yaml", "-p",
"configmap:my-cm-test-property").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"property-route", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"property-route"),
TestTimeoutShort).Should(ContainSubstring("my-configmap-property-value"))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"property-route", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"property-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"property-route")).Should(ContainSubstring("my-configmap-property-value"))
})
t.Run("Property from Secret", func(t *testing.T) {
@@ -78,9 +78,9 @@ func TestRunConfigProperties(t *testing.T) {
g.Expect(err).To(BeNil())
g.Expect(KamelRun(t, ctx, ns,
"./files/property-route.yaml", "-p",
"secret:my-sec-test-property").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"property-route", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"property-route"),
TestTimeoutShort).Should(ContainSubstring("my-secret-property-value"))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"property-route", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"property-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"property-route")).Should(ContainSubstring("my-secret-property-value"))
})
})
@@ -114,47 +114,47 @@ func TestRunConfigConfigmaps(t *testing.T) {
t.Run("Config configmap", func(t *testing.T) {
g.Expect(KamelRun(t, ctx, ns,
"./files/config-configmap-route.yaml", "--config",
"configmap:my-cm").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"config-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"config-configmap-route", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"config-configmap-route"),
TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"config-configmap-route", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"config-configmap-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"config-configmap-route")).Should(ContainSubstring(cmData["my-configmap-key"]))
})
t.Run("Config configmap from properties file", func(t
*testing.T) {
g.Expect(KamelRun(t, ctx, ns,
"./files/config-configmap-properties-route.yaml", "--config",
"configmap:my-cm-properties-file").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"config-configmap-properties-route"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"config-configmap-properties-route", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"config-configmap-properties-route"),
TestTimeoutShort).Should(ContainSubstring("hello world"))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"config-configmap-properties-route", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"config-configmap-properties-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"config-configmap-properties-route")).Should(ContainSubstring("hello world"))
})
t.Run("Config configmap from properties file (interpolated)",
func(t *testing.T) {
g.Expect(KamelRun(t, ctx, ns,
"./files/config-configmap-properties-interpolation-route.yaml", "--config",
"configmap:my-cm-properties-file").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"config-configmap-properties-interpolation-route"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"config-configmap-properties-interpolation-route",
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"config-configmap-properties-interpolation-route"),
TestTimeoutShort).Should(ContainSubstring("hello world"))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"config-configmap-properties-interpolation-route",
v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"config-configmap-properties-interpolation-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"config-configmap-properties-interpolation-route")).Should(ContainSubstring("hello
world"))
})
t.Run("Resource configmap", func(t *testing.T) {
// We can reuse the configmap created previously
g.Expect(KamelRun(t, ctx, ns,
"./files/resource-configmap-route.yaml", "--resource",
"configmap:my-cm").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"resource-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"resource-configmap-route", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"resource-configmap-route"),
TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"resource-configmap-route", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"resource-configmap-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"resource-configmap-route")).Should(ContainSubstring(cmData["my-configmap-key"]))
})
t.Run("Resource configmap with destination", func(t *testing.T)
{
g.Expect(KamelRun(t, ctx, ns,
"./files/resource-configmap-location-route.yaml", "--resource",
"configmap:my-cm@/tmp/app").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"resource-configmap-location-route"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"resource-configmap-location-route", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"resource-configmap-location-route"),
TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"resource-configmap-location-route", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"resource-configmap-location-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"resource-configmap-location-route")).Should(ContainSubstring(cmData["my-configmap-key"]))
})
t.Run("Resource configmap with filtered key and destination",
func(t *testing.T) {
// We'll use the configmap containing 2 values
filtering only 1 key
g.Expect(KamelRun(t, ctx, ns,
"./files/resource-configmap-key-location-route.yaml", "--resource",
"configmap:my-cm-multi/my-configmap-key-2@/tmp/app/test.txt").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"resource-configmap-key-location-route"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"resource-configmap-key-location-route", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"resource-configmap-key-location-route"),
TestTimeoutShort).ShouldNot(ContainSubstring(cmDataMulti["my-configmap-key"]))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"resource-configmap-key-location-route"),
TestTimeoutShort).Should(ContainSubstring(cmDataMulti["my-configmap-key-2"]))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"resource-configmap-key-location-route", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"resource-configmap-key-location-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"resource-configmap-key-location-route")).ShouldNot(ContainSubstring(cmDataMulti["my-configmap-key"]))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"resource-configmap-key-location-route")).Should(ContainSubstring(cmDataMulti["my-configmap-key-2"]))
})
})
}
@@ -181,16 +181,16 @@ func TestRunConfigSecrets(t *testing.T) {
t.Run("Config secret", func(t *testing.T) {
g.Expect(KamelRun(t, ctx, ns,
"./files/config-secret-route.yaml", "--config",
"secret:my-sec").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"config-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"config-secret-route", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"config-secret-route"),
TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"config-secret-route", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"config-secret-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"config-secret-route")).Should(ContainSubstring(secData["my-secret-key"]))
})
t.Run("Resource secret", func(t *testing.T) {
g.Expect(KamelRun(t, ctx, ns,
"./files/resource-secret-route.yaml", "--resource",
"secret:my-sec").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"resource-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"resource-secret-route", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"resource-secret-route"),
TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"resource-secret-route", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"resource-secret-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"resource-secret-route")).Should(ContainSubstring(secData["my-secret-key"]))
})
/*
@@ -199,10 +199,10 @@ func TestRunConfigSecrets(t *testing.T) {
t.Run("Secret with filtered key", func(t *testing.T) {
g.Expect(KamelRun(t, ctx, ns,
"./files/config-secret-key-route.yaml", "--config",
"secret:my-sec-multi/my-secret-key-2").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"config-secret-key-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"config-secret-key-route", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"config-secret-key-route"),
TestTimeoutShort).ShouldNot(ContainSubstring(secDataMulti["my-secret-key"]))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"config-secret-key-route"),
TestTimeoutShort).Should(ContainSubstring(secDataMulti["my-secret-key-2"]))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"config-secret-key-route", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"config-secret-key-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"config-secret-key-route")).ShouldNot(ContainSubstring(secDataMulti["my-secret-key"]))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"config-secret-key-route")).Should(ContainSubstring(secDataMulti["my-secret-key-2"]))
})
})
@@ -213,18 +213,18 @@ func TestRunConfigBuildProperties(t *testing.T) {
WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) {
t.Run("Build time property", func(t *testing.T) {
g.Expect(KamelRun(t, ctx, ns,
"./files/build-property-route.yaml", "--build-property",
"quarkus.application.name=my-super-application").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"build-property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"build-property-route", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"build-property-route"),
TestTimeoutShort).Should(ContainSubstring("my-super-application"))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"build-property-route", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"build-property-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"build-property-route")).Should(ContainSubstring("my-super-application"))
// Don't delete - we need it for next test execution
})
// We need to check also that the property (which is available
in the IntegrationKit) is correctly replaced and that we don't reuse the same
kit
t.Run("Build time property updated", func(t *testing.T) {
g.Expect(KamelRun(t, ctx, ns,
"./files/build-property-route.yaml", "--name", "build-property-route-updated",
"--build-property",
"quarkus.application.name=my-super-application-updated").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"build-property-route-updated"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"build-property-route-updated", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"build-property-route-updated"),
TestTimeoutShort).Should(ContainSubstring("my-super-application-updated"))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"build-property-route-updated", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"build-property-route-updated")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"build-property-route-updated")).Should(ContainSubstring("my-super-application-updated"))
// Verify the integration kits are different
g.Eventually(IntegrationKitName(t, ctx, ns,
"build-property-route-updated")).ShouldNot(Equal(IntegrationKitName(t, ctx, ns,
"build-property-route")()))
})
@@ -232,16 +232,16 @@ func TestRunConfigBuildProperties(t *testing.T) {
// Build-Properties file
t.Run("Build time property file", func(t *testing.T) {
g.Expect(KamelRun(t, ctx, ns,
"./files/build-property-file-route.yaml", "--build-property",
"file:./files/quarkus.properties").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"build-property-file-route", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"build-property-file-route"),
TestTimeoutShort).Should(ContainSubstring("my-super-application"))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"build-property-file-route", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"build-property-file-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"build-property-file-route")).Should(ContainSubstring("my-super-application"))
})
t.Run("Build time property file with precedence", func(t
*testing.T) {
g.Expect(KamelRun(t, ctx, ns,
"./files/build-property-file-route.yaml", "--name",
"build-property-file-route-precedence", "--build-property",
"quarkus.application.name=my-overridden-application", "--build-property",
"file:./files/quarkus.properties").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"build-property-file-route-precedence"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"build-property-file-route-precedence", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"build-property-file-route-precedence"),
TestTimeoutShort).Should(ContainSubstring("my-overridden-application"))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"build-property-file-route-precedence", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"build-property-file-route-precedence")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"build-property-file-route-precedence")).Should(ContainSubstring("my-overridden-application"))
})
t.Run("Build time property from ConfigMap", func(t *testing.T) {
@@ -251,9 +251,9 @@ func TestRunConfigBuildProperties(t *testing.T) {
g.Expect(err).To(BeNil())
g.Expect(KamelRun(t, ctx, ns,
"./files/build-property-file-route.yaml", "--build-property",
"configmap:my-cm-test-build-property").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"build-property-file-route", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"build-property-file-route"),
TestTimeoutShort).Should(ContainSubstring("my-cool-application"))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"build-property-file-route", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"build-property-file-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"build-property-file-route")).Should(ContainSubstring("my-cool-application"))
})
t.Run("Build time property from ConfigMap as property file",
func(t *testing.T) {
@@ -263,9 +263,9 @@ func TestRunConfigBuildProperties(t *testing.T) {
g.Expect(err).To(BeNil())
g.Expect(KamelRun(t, ctx, ns,
"./files/build-property-file-route.yaml", "--name",
"build-property-file-route-cm", "--build-property",
"configmap:my-cm-test-build-properties").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"build-property-file-route-cm"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"build-property-file-route-cm", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"build-property-file-route-cm"),
TestTimeoutShort).Should(ContainSubstring("my-super-cool-application"))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"build-property-file-route-cm", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"build-property-file-route-cm")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"build-property-file-route-cm")).Should(ContainSubstring("my-super-cool-application"))
})
t.Run("Build time property from Secret", func(t *testing.T) {
@@ -275,9 +275,9 @@ func TestRunConfigBuildProperties(t *testing.T) {
g.Expect(err).To(BeNil())
g.Expect(KamelRun(t, ctx, ns,
"./files/build-property-file-route.yaml", "--build-property",
"secret:my-sec-test-build-property").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"build-property-file-route", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"build-property-file-route"),
TestTimeoutShort).Should(ContainSubstring("my-great-application"))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"build-property-file-route", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"build-property-file-route")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"build-property-file-route")).Should(ContainSubstring("my-great-application"))
})
t.Run("Build time property from Secret as property file",
func(t *testing.T) {
@@ -287,9 +287,9 @@ func TestRunConfigBuildProperties(t *testing.T) {
g.Expect(err).To(BeNil())
g.Expect(KamelRun(t, ctx, ns,
"./files/build-property-file-route.yaml", "--name",
"build-property-file-route-secret", "--build-property",
"secret:my-sec-test-build-properties").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"build-property-file-route-secret"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"build-property-file-route-secret", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"build-property-file-route-secret"),
TestTimeoutShort).Should(ContainSubstring("my-awesome-application"))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"build-property-file-route-secret", v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
"build-property-file-route-secret")).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ctx, ns,
"build-property-file-route-secret")).Should(ContainSubstring("my-awesome-application"))
})
})
