This is an automated email from the ASF dual-hosted git repository.
gfournier 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 3da4b5dcb fix(e2e): Fix cron test
3da4b5dcb is described below
commit 3da4b5dcb6037afb032ac3c097c8270b767419bf
Author: Gaelle Fournier <gaelle.fournier.w...@gmail.com>
AuthorDate: Fri Jul 19 13:14:11 2024 +0200
fix(e2e): Fix cron test
---
e2e/common/misc/cron_test.go | 50 ++++++++++++++++++++++++++------------------
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git a/e2e/common/misc/cron_test.go b/e2e/common/misc/cron_test.go
index 37b3a2031..c86f35c00 100644
--- a/e2e/common/misc/cron_test.go
+++ b/e2e/common/misc/cron_test.go
@@ -41,37 +41,46 @@ func TestRunCronExample(t *testing.T) {
WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) {
t.Run("cron-yaml", func(t *testing.T) {
- g.Expect(KamelRun(t, ctx, ns,
"files/cron-yaml.yaml").Execute()).To(Succeed())
- g.Eventually(IntegrationCronJob(t, ctx, ns,
"cron-yaml")).ShouldNot(BeNil())
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"cron-yaml", v1.IntegrationConditionReady)).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"cron-yaml")).Should(ContainSubstring("Magicstring!"))
+ name := RandomizedSuffixName("cron-yaml")
+ g.Expect(KamelRun(t, ctx, ns, "files/cron-yaml.yaml",
"--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationCronJob(t, ctx, ns,
name)).ShouldNot(BeNil())
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
name, v1.IntegrationConditionReady)).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ctx, ns, name),
TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ g.Expect(Kamel(t, ctx, "delete", name, "-n",
ns).Execute()).To(Succeed())
})
t.Run("cron-timer", func(t *testing.T) {
- g.Expect(KamelRun(t, ctx, ns,
"files/cron-timer.yaml").Execute()).To(Succeed())
- g.Eventually(IntegrationCronJob(t, ctx, ns,
"cron-timer"), TestTimeoutLong).ShouldNot(BeNil())
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"cron-timer", v1.IntegrationConditionReady)).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"cron-timer")).Should(ContainSubstring("Magicstring!"))
+ name := RandomizedSuffixName("cron-timer")
+ g.Expect(KamelRun(t, ctx, ns, "files/cron-timer.yaml",
"--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationCronJob(t, ctx, ns, name),
TestTimeoutLong).ShouldNot(BeNil())
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
name, v1.IntegrationConditionReady)).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ctx, ns, name),
TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ g.Expect(Kamel(t, ctx, "delete", name, "-n",
ns).Execute()).To(Succeed())
})
t.Run("cron-fallback", func(t *testing.T) {
- g.Expect(KamelRun(t, ctx, ns,
"files/cron-fallback.yaml").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"cron-fallback")).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"cron-fallback",
v1.IntegrationConditionReady)).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"cron-fallback")).Should(ContainSubstring("Magicstring!"))
+ name := RandomizedSuffixName("cron-fallback")
+ g.Expect(KamelRun(t, ctx, ns,
"files/cron-fallback.yaml", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
name)).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
name, v1.IntegrationConditionReady)).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ctx, ns, name),
TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ g.Expect(Kamel(t, ctx, "delete", name, "-n",
ns).Execute()).To(Succeed())
})
t.Run("cron-quartz", func(t *testing.T) {
- g.Expect(KamelRun(t, ctx, ns,
"files/cron-quartz.yaml").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns,
"cron-quartz")).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"cron-quartz",
v1.IntegrationConditionReady)).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns,
"cron-quartz")).Should(ContainSubstring("Magicstring!"))
+ name := RandomizedSuffixName("cron-quartz")
+ g.Expect(KamelRun(t, ctx, ns, "files/cron-quartz.yaml",
"--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ctx, ns,
name)).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
name, v1.IntegrationConditionReady)).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ctx, ns, name),
TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ g.Expect(Kamel(t, ctx, "delete", name, "-n",
ns).Execute()).To(Succeed())
})
t.Run("cron-trait-yaml", func(t *testing.T) {
- g.Expect(KamelRun(t, ctx, ns,
"files/cron-trait-yaml.yaml", "-t", "cron.enabled=true", "-t",
"cron.schedule=0/2 * * * *").Execute()).To(Succeed())
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"cron-trait-yaml",
v1.IntegrationConditionReady)).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationCronJob(t, ctx, ns,
"cron-trait-yaml")).ShouldNot(BeNil())
+ name := RandomizedSuffixName("cron-trait-yaml")
+ g.Expect(KamelRun(t, ctx, ns,
"files/cron-trait-yaml.yaml", "--name", name, "-t", "cron.enabled=true", "-t",
"cron.schedule=0/2 * * * *").Execute()).To(Succeed())
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
name, v1.IntegrationConditionReady)).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationCronJob(t, ctx, ns,
name)).ShouldNot(BeNil())
// Verify that `-t cron.schedule` overrides the
schedule in the yaml
//
@@ -79,8 +88,9 @@ func TestRunCronExample(t *testing.T) {
// NAME SCHEDULE SUSPEND ACTIVE
LAST SCHEDULE AGE
// cron-trait-yaml 0/2 * * * * False 0
<none> 38s
- cronJob := IntegrationCronJob(t, ctx, ns,
"cron-trait-yaml")()
+ cronJob := IntegrationCronJob(t, ctx, ns, name)()
assert.Equal(t, "0/2 * * * *", cronJob.Spec.Schedule)
+ g.Expect(Kamel(t, ctx, "delete", name, "-n",
ns).Execute()).To(Succeed())
})
})
}
