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
The following commit(s) were added to refs/heads/main by this push:
new 72a704aeb fix(e2e): HotReload tests should not reload by default
72a704aeb is described below
commit 72a704aeb068532344678a3f04dc326b0339fac6
Author: Gaelle Fournier <[email protected]>
AuthorDate: Tue Nov 7 11:14:47 2023 +0100
fix(e2e): HotReload tests should not reload by default
---
e2e/common/config/config_reload_test.go | 43 +++++++++++++++++++++++----------
1 file changed, 30 insertions(+), 13 deletions(-)
diff --git a/e2e/common/config/config_reload_test.go
b/e2e/common/config/config_reload_test.go
index 0e9f35c7c..338dd7f6e 100644
--- a/e2e/common/config/config_reload_test.go
+++ b/e2e/common/config/config_reload_test.go
@@ -36,6 +36,8 @@ import (
func TestConfigmapHotReload(t *testing.T) {
RegisterTestingT(t)
+ name := RandomizedSuffixName("config-configmap-route")
+
var cmData = make(map[string]string)
cmData["my-configmap-key"] = "my configmap content"
CreatePlainTextConfigmap(ns, "my-hot-cm", cmData)
@@ -46,14 +48,16 @@ func TestConfigmapHotReload(t *testing.T) {
"configmap:my-hot-cm",
"-t",
"mount.hot-reload=true",
+ "--name",
+ name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "config-configmap-route"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "config-configmap-route",
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "config-configmap-route"),
TestTimeoutShort).Should(ContainSubstring("my configmap content"))
+ Eventually(IntegrationPodPhase(ns, name),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name,
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name),
TestTimeoutShort).Should(ContainSubstring("my configmap content"))
cmData["my-configmap-key"] = "my configmap content updated"
UpdatePlainTextConfigmap(ns, "my-hot-cm", cmData)
- Eventually(IntegrationLogs(ns, "config-configmap-route"),
TestTimeoutShort).Should(ContainSubstring("my configmap content updated"))
+ Eventually(IntegrationLogs(ns, name),
TestTimeoutShort).Should(ContainSubstring("my configmap content updated"))
Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
@@ -61,6 +65,8 @@ func TestConfigmapHotReload(t *testing.T) {
func TestConfigmapHotReloadDefault(t *testing.T) {
RegisterTestingT(t)
+ name := RandomizedSuffixName("config-configmap-route")
+
var cmData = make(map[string]string)
cmData["my-configmap-key"] = "my configmap content"
CreatePlainTextConfigmap(ns, "my-hot-cm-2", cmData)
@@ -68,14 +74,16 @@ func TestConfigmapHotReloadDefault(t *testing.T) {
Expect(KamelRunWithID(operatorID, ns,
"./files/config-configmap-route.groovy",
"--config",
"configmap:my-hot-cm-2",
+ "--name",
+ name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "config-configmap-route"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "config-configmap-route",
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "config-configmap-route"),
TestTimeoutShort).Should(ContainSubstring("my configmap content"))
+ Eventually(IntegrationPodPhase(ns, name),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name,
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name),
TestTimeoutShort).Should(ContainSubstring("my configmap content"))
cmData["my-configmap-key"] = "my configmap content updated"
UpdatePlainTextConfigmap(ns, "my-hot-cm-2", cmData)
- Eventually(IntegrationLogs(ns, "config-configmap-route"),
TestTimeoutShort).Should(Not(ContainSubstring("my configmap content updated")))
+ Eventually(IntegrationLogs(ns, name),
TestTimeoutShort).Should(Not(ContainSubstring("my configmap content updated")))
Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
@@ -83,18 +91,27 @@ func TestConfigmapHotReloadDefault(t *testing.T) {
func TestSecretHotReload(t *testing.T) {
RegisterTestingT(t)
+ name := RandomizedSuffixName("config-secret-route")
+
var secData = make(map[string]string)
secData["my-secret-key"] = "very top secret"
CreatePlainTextSecret(ns, "my-hot-sec", secData)
- Expect(KamelRunWithID(operatorID, ns,
"./files/config-secret-route.groovy", "--config",
"secret:my-hot-sec").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "config-secret-route"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "config-secret-route",
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "config-secret-route"),
TestTimeoutShort).Should(ContainSubstring("very top secret"))
+ Expect(KamelRunWithID(operatorID, ns,
"./files/config-secret-route.groovy",
+ "--config",
+ "secret:my-hot-sec",
+ "-t",
+ "mount.hot-reload=true",
+ "--name",
+ name,
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name,
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name),
TestTimeoutShort).Should(ContainSubstring("very top secret"))
secData["my-secret-key"] = "very top secret updated"
UpdatePlainTextSecret(ns, "my-hot-sec", secData)
- Eventually(IntegrationLogs(ns, "config-secret-route"),
TestTimeoutShort).Should(ContainSubstring("very top secret updated"))
+ Eventually(IntegrationLogs(ns, name),
TestTimeoutShort).Should(ContainSubstring("very top secret updated"))
Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
