This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new 2db7827 Cleanup files dir
2db7827 is described below
commit 2db78272245c9c6541862d57046041653e76b786
Author: Jan <jbou...@redhat.com>
AuthorDate: Tue Feb 23 10:19:28 2021 +0100
Cleanup files dir
---
.../{files/Prop.java => languages/files/Java.java} | 5 +++--
e2e/common/{ => languages}/files/Prop.java | 0
e2e/common/{ => languages}/files/groovy.groovy | 0
e2e/common/{ => languages}/files/js-polyglot.js | 0
e2e/common/{ => languages}/files/js.js | 0
e2e/common/{ => languages}/files/kotlin.kts | 0
e2e/common/{ => languages}/files/prop.properties | 0
e2e/common/{ => languages}/files/xml.xml | 0
e2e/common/{ => languages}/files/yaml-polyglot.yaml | 0
.../yaml-polyglot.yaml => languages/files/yaml.yaml} | 2 +-
e2e/common/languages/groovy_test.go | 2 +-
e2e/common/languages/java_test.go | 4 ++--
e2e/common/languages/js_test.go | 2 +-
e2e/common/languages/kotlin_test.go | 2 +-
e2e/common/languages/polyglot_test.go | 2 +-
e2e/common/languages/xml_test.go | 2 +-
e2e/common/languages/yaml_test.go | 4 ++--
e2e/common/traits/affinity_test.go | 6 +++---
.../{files/Prop.java => traits/files/Java.java} | 5 +++--
e2e/common/traits/istio_test.go | 2 +-
e2e/common/traits/jolokia_test.go | 2 +-
e2e/common/traits/pdb_test.go | 2 +-
e2e/common/traits/prometheus_test.go | 2 +-
e2e/common/traits/pull_secret_test.go | 6 +++---
e2e/common/upgrade_test.go | 20 ++++++++++----------
25 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/e2e/common/files/Prop.java b/e2e/common/languages/files/Java.java
similarity index 88%
copy from e2e/common/files/Prop.java
copy to e2e/common/languages/files/Java.java
index 692ff80..66fef5f 100644
--- a/e2e/common/files/Prop.java
+++ b/e2e/common/languages/files/Java.java
@@ -17,11 +17,12 @@
import org.apache.camel.builder.RouteBuilder;
-public class Prop extends RouteBuilder {
+public class Java extends RouteBuilder {
@Override
public void configure() throws Exception {
from("timer:tick")
- .setBody().simple("Magic{{myproperty}}")
+ .setHeader("m").constant("string!")
+ .setBody().simple("Magic${header.m}")
.log("${body}");
}
}
diff --git a/e2e/common/files/Prop.java b/e2e/common/languages/files/Prop.java
similarity index 100%
copy from e2e/common/files/Prop.java
copy to e2e/common/languages/files/Prop.java
diff --git a/e2e/common/files/groovy.groovy
b/e2e/common/languages/files/groovy.groovy
similarity index 100%
rename from e2e/common/files/groovy.groovy
rename to e2e/common/languages/files/groovy.groovy
diff --git a/e2e/common/files/js-polyglot.js
b/e2e/common/languages/files/js-polyglot.js
similarity index 100%
rename from e2e/common/files/js-polyglot.js
rename to e2e/common/languages/files/js-polyglot.js
diff --git a/e2e/common/files/js.js b/e2e/common/languages/files/js.js
similarity index 100%
rename from e2e/common/files/js.js
rename to e2e/common/languages/files/js.js
diff --git a/e2e/common/files/kotlin.kts b/e2e/common/languages/files/kotlin.kts
similarity index 100%
rename from e2e/common/files/kotlin.kts
rename to e2e/common/languages/files/kotlin.kts
diff --git a/e2e/common/files/prop.properties
b/e2e/common/languages/files/prop.properties
similarity index 100%
rename from e2e/common/files/prop.properties
rename to e2e/common/languages/files/prop.properties
diff --git a/e2e/common/files/xml.xml b/e2e/common/languages/files/xml.xml
similarity index 100%
rename from e2e/common/files/xml.xml
rename to e2e/common/languages/files/xml.xml
diff --git a/e2e/common/files/yaml-polyglot.yaml
b/e2e/common/languages/files/yaml-polyglot.yaml
similarity index 100%
copy from e2e/common/files/yaml-polyglot.yaml
copy to e2e/common/languages/files/yaml-polyglot.yaml
diff --git a/e2e/common/files/yaml-polyglot.yaml
b/e2e/common/languages/files/yaml.yaml
similarity index 96%
rename from e2e/common/files/yaml-polyglot.yaml
rename to e2e/common/languages/files/yaml.yaml
index 0634d2f..9ccf652 100644
--- a/e2e/common/files/yaml-polyglot.yaml
+++ b/e2e/common/languages/files/yaml.yaml
@@ -22,7 +22,7 @@
steps:
- set-header:
name: "m"
- constant: "polyglot-yaml"
+ constant: "string!"
- set-body:
simple: "Magic${header.m}"
- to: "log:info"
diff --git a/e2e/common/languages/groovy_test.go
b/e2e/common/languages/groovy_test.go
index a09b365..12f2776 100644
--- a/e2e/common/languages/groovy_test.go
+++ b/e2e/common/languages/groovy_test.go
@@ -37,7 +37,7 @@ func TestRunSimpleGroovyExamples(t *testing.T) {
Expect(Kamel("install", "-n", ns).Execute()).To(Succeed())
t.Run("run groovy", func(t *testing.T) {
- Expect(Kamel("run", "-n", ns,
"../files/groovy.groovy").Execute()).To(Succeed())
+ Expect(Kamel("run", "-n", ns,
"files/groovy.groovy").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "groovy"),
TestTimeoutMedium).Should(Equal(v1.PodRunning))
Eventually(IntegrationCondition(ns, "groovy",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
Eventually(IntegrationLogs(ns, "groovy"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
diff --git a/e2e/common/languages/java_test.go
b/e2e/common/languages/java_test.go
index 784b1b3..5134e15 100644
--- a/e2e/common/languages/java_test.go
+++ b/e2e/common/languages/java_test.go
@@ -37,7 +37,7 @@ func TestRunSimpleJavaExamples(t *testing.T) {
Expect(Kamel("install", "-n", ns).Execute()).To(Succeed())
t.Run("run java", func(t *testing.T) {
- Expect(Kamel("run", "-n", ns,
"../files/Java.java").Execute()).To(Succeed())
+ Expect(Kamel("run", "-n", ns,
"files/Java.java").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "java"),
TestTimeoutMedium).Should(Equal(v1.PodRunning))
Eventually(IntegrationCondition(ns, "java",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
Eventually(IntegrationLogs(ns, "java"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
@@ -45,7 +45,7 @@ func TestRunSimpleJavaExamples(t *testing.T) {
})
t.Run("run java with properties", func(t *testing.T) {
- Expect(Kamel("run", "-n", ns, "../files/Prop.java",
"--property-file", "../files/prop.properties").Execute()).To(Succeed())
+ Expect(Kamel("run", "-n", ns, "files/Prop.java",
"--property-file", "files/prop.properties").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "prop"),
TestTimeoutMedium).Should(Equal(v1.PodRunning))
Eventually(IntegrationCondition(ns, "prop",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
Eventually(IntegrationLogs(ns, "prop"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
diff --git a/e2e/common/languages/js_test.go b/e2e/common/languages/js_test.go
index e857b4a..6429f85 100644
--- a/e2e/common/languages/js_test.go
+++ b/e2e/common/languages/js_test.go
@@ -37,7 +37,7 @@ func TestRunSimpleJavaScriptExamples(t *testing.T) {
Expect(Kamel("install", "-n", ns).Execute()).To(Succeed())
t.Run("run js", func(t *testing.T) {
- Expect(Kamel("run", "-n", ns,
"../files/js.js").Execute()).To(Succeed())
+ Expect(Kamel("run", "-n", ns,
"files/js.js").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "js"),
TestTimeoutMedium).Should(Equal(v1.PodRunning))
Eventually(IntegrationCondition(ns, "js",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
Eventually(IntegrationLogs(ns, "js"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
diff --git a/e2e/common/languages/kotlin_test.go
b/e2e/common/languages/kotlin_test.go
index 0e97f95..ae71328 100644
--- a/e2e/common/languages/kotlin_test.go
+++ b/e2e/common/languages/kotlin_test.go
@@ -37,7 +37,7 @@ func TestRunSimpleKotlinExamples(t *testing.T) {
Expect(Kamel("install", "-n", ns).Execute()).To(Succeed())
t.Run("run kotlin", func(t *testing.T) {
- Expect(Kamel("run", "-n", ns,
"../files/kotlin.kts").Execute()).To(Succeed())
+ Expect(Kamel("run", "-n", ns,
"files/kotlin.kts").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "kotlin"),
TestTimeoutMedium).Should(Equal(v1.PodRunning))
Eventually(IntegrationCondition(ns, "kotlin",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
Eventually(IntegrationLogs(ns, "kotlin"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
diff --git a/e2e/common/languages/polyglot_test.go
b/e2e/common/languages/polyglot_test.go
index 8c520e6..a2b50e3 100644
--- a/e2e/common/languages/polyglot_test.go
+++ b/e2e/common/languages/polyglot_test.go
@@ -37,7 +37,7 @@ func TestRunPolyglotExamples(t *testing.T) {
Expect(Kamel("install", "-n", ns).Execute()).To(Succeed())
t.Run("run polyglot", func(t *testing.T) {
- Expect(Kamel("run", "-n", ns, "--name", "polyglot",
"../files/js-polyglot.js",
"../files/yaml-polyglot.yaml").Execute()).To(Succeed())
+ Expect(Kamel("run", "-n", ns, "--name", "polyglot",
"files/js-polyglot.js", "files/yaml-polyglot.yaml").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "polyglot"),
TestTimeoutMedium).Should(Equal(v1.PodRunning))
Eventually(IntegrationCondition(ns, "polyglot",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
Eventually(IntegrationLogs(ns, "polyglot"),
TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-yaml"))
diff --git a/e2e/common/languages/xml_test.go b/e2e/common/languages/xml_test.go
index c1b0fc9..2a214fb 100644
--- a/e2e/common/languages/xml_test.go
+++ b/e2e/common/languages/xml_test.go
@@ -37,7 +37,7 @@ func TestRunSimpleXmlExamples(t *testing.T) {
Expect(Kamel("install", "-n", ns).Execute()).To(Succeed())
t.Run("run xml", func(t *testing.T) {
- Expect(Kamel("run", "-n", ns,
"../files/xml.xml").Execute()).To(Succeed())
+ Expect(Kamel("run", "-n", ns,
"files/xml.xml").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "xml"),
TestTimeoutMedium).Should(Equal(v1.PodRunning))
Eventually(IntegrationCondition(ns, "xml",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
Eventually(IntegrationLogs(ns, "xml"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
diff --git a/e2e/common/languages/yaml_test.go
b/e2e/common/languages/yaml_test.go
index 083e658..f97562e 100644
--- a/e2e/common/languages/yaml_test.go
+++ b/e2e/common/languages/yaml_test.go
@@ -37,7 +37,7 @@ func TestRunSimpleYamlExamples(t *testing.T) {
Expect(Kamel("install", "-n", ns).Execute()).To(Succeed())
t.Run("run yaml", func(t *testing.T) {
- Expect(Kamel("run", "-n", ns,
"../files/yaml.yaml").Execute()).To(Succeed())
+ Expect(Kamel("run", "-n", ns,
"files/yaml.yaml").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "yaml"),
TestTimeoutMedium).Should(Equal(v1.PodRunning))
Eventually(IntegrationCondition(ns, "yaml",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
Eventually(IntegrationLogs(ns, "yaml"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
@@ -45,7 +45,7 @@ func TestRunSimpleYamlExamples(t *testing.T) {
})
t.Run("run yaml Quarkus", func(t *testing.T) {
- Expect(Kamel("run", "-n", ns, "--name", "yaml-quarkus",
"../files/yaml.yaml", "-t", "quarkus.enabled=true").Execute()).To(Succeed())
+ Expect(Kamel("run", "-n", ns, "--name", "yaml-quarkus",
"files/yaml.yaml", "-t", "quarkus.enabled=true").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "yaml-quarkus"),
TestTimeoutMedium).Should(Equal(v1.PodRunning))
Eventually(IntegrationCondition(ns, "yaml-quarkus",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
Eventually(IntegrationLogs(ns, "yaml-quarkus"),
TestTimeoutShort).Should(ContainSubstring("powered by Quarkus"))
diff --git a/e2e/common/traits/affinity_test.go
b/e2e/common/traits/affinity_test.go
index e939aae..53b0162 100644
--- a/e2e/common/traits/affinity_test.go
+++ b/e2e/common/traits/affinity_test.go
@@ -48,7 +48,7 @@ func TestAffinityTrait(t *testing.T) {
if hostname != "" {
t.Run("Run Java with node affinity", func(t *testing.T)
{
- Expect(Kamel("run", "-n", ns,
"../files/Java.java",
+ Expect(Kamel("run", "-n", ns, "files/Java.java",
"--name", "java1",
"-t", "affinity.enabled=true",
"-t",
fmt.Sprintf("affinity.node-affinity-labels=kubernetes.io/hostname in(%s)",
hostname)).Execute()).To(Succeed())
@@ -68,7 +68,7 @@ func TestAffinityTrait(t *testing.T) {
}
t.Run("Run Java with pod affinity", func(t *testing.T) {
- Expect(Kamel("run", "-n", ns, "../files/Java.java",
+ Expect(Kamel("run", "-n", ns, "files/Java.java",
"--name", "java2",
"-t", "affinity.enabled=true",
"-t",
"affinity.pod-affinity-labels=camel.apache.org/integration").Execute()).To(Succeed())
@@ -88,7 +88,7 @@ func TestAffinityTrait(t *testing.T) {
})
t.Run("Run Java with pod anti affinity", func(t *testing.T) {
- Expect(Kamel("run", "-n", ns, "../files/Java.java",
+ Expect(Kamel("run", "-n", ns, "files/Java.java",
"--name", "java3",
"-t", "affinity.enabled=true",
"-t",
"affinity.pod-anti-affinity-labels=camel.apache.org/integration").Execute()).To(Succeed())
diff --git a/e2e/common/files/Prop.java b/e2e/common/traits/files/Java.java
similarity index 88%
rename from e2e/common/files/Prop.java
rename to e2e/common/traits/files/Java.java
index 692ff80..66fef5f 100644
--- a/e2e/common/files/Prop.java
+++ b/e2e/common/traits/files/Java.java
@@ -17,11 +17,12 @@
import org.apache.camel.builder.RouteBuilder;
-public class Prop extends RouteBuilder {
+public class Java extends RouteBuilder {
@Override
public void configure() throws Exception {
from("timer:tick")
- .setBody().simple("Magic{{myproperty}}")
+ .setHeader("m").constant("string!")
+ .setBody().simple("Magic${header.m}")
.log("${body}");
}
}
diff --git a/e2e/common/traits/istio_test.go b/e2e/common/traits/istio_test.go
index 092a051..96d4d1a 100644
--- a/e2e/common/traits/istio_test.go
+++ b/e2e/common/traits/istio_test.go
@@ -37,7 +37,7 @@ func TestIstioTrait(t *testing.T) {
Expect(Kamel("install", "-n", ns).Execute()).To(Succeed())
t.Run("Run Java with Istio", func(t *testing.T) {
- Expect(Kamel("run", "-n", ns, "../files/Java.java",
+ Expect(Kamel("run", "-n", ns, "files/Java.java",
"-t",
"istio.enabled=true").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "java"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
Eventually(IntegrationCondition(ns, "java",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
diff --git a/e2e/common/traits/jolokia_test.go
b/e2e/common/traits/jolokia_test.go
index 689f706..fb6bbae 100644
--- a/e2e/common/traits/jolokia_test.go
+++ b/e2e/common/traits/jolokia_test.go
@@ -38,7 +38,7 @@ func TestJolokiaTrait(t *testing.T) {
Expect(Kamel("install", "-n", ns).Execute()).To(Succeed())
t.Run("Run Java with Jolokia", func(t *testing.T) {
- Expect(Kamel("run", "-n", ns, "../files/Java.java",
+ Expect(Kamel("run", "-n", ns, "files/Java.java",
"-t", "jolokia.enabled=true",
"-t",
"jolokia.use-ssl-client-authentication=false",
"-t", "jolokia.protocol=http",
diff --git a/e2e/common/traits/pdb_test.go b/e2e/common/traits/pdb_test.go
index 376db27..d154289 100644
--- a/e2e/common/traits/pdb_test.go
+++ b/e2e/common/traits/pdb_test.go
@@ -44,7 +44,7 @@ func TestPodDisruptionBudget(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
name := "java"
Expect(Kamel("install", "-n", ns).Execute()).To(Succeed())
- Expect(Kamel("run", "-n", ns, "../files/Java.java",
+ Expect(Kamel("run", "-n", ns, "files/Java.java",
"--name", name,
"-t", "pdb.enabled=true",
"-t", "pdb.min-available=2",
diff --git a/e2e/common/traits/prometheus_test.go
b/e2e/common/traits/prometheus_test.go
index e34d596..b33a55f 100644
--- a/e2e/common/traits/prometheus_test.go
+++ b/e2e/common/traits/prometheus_test.go
@@ -50,7 +50,7 @@ func TestPrometheusTrait(t *testing.T) {
Expect(Kamel("install", "-n", ns).Execute()).To(Succeed())
- Expect(Kamel("run", "-n", ns, "../files/Java.java",
+ Expect(Kamel("run", "-n", ns, "files/Java.java",
"-t", "prometheus.enabled=true",
"-t", fmt.Sprintf("prometheus.service-monitor=%v",
createServiceMonitor)).Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "java"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
diff --git a/e2e/common/traits/pull_secret_test.go
b/e2e/common/traits/pull_secret_test.go
index 2317a39..b5cd679 100644
--- a/e2e/common/traits/pull_secret_test.go
+++ b/e2e/common/traits/pull_secret_test.go
@@ -41,7 +41,7 @@ func TestPullSecretTrait(t *testing.T) {
Expect(Kamel("install", "-n", ns).Execute()).To(Succeed())
t.Run("Image pull secret is set on pod", func(t *testing.T) {
- Expect(Kamel("run", "-n", ns, "../files/Java.java",
+ Expect(Kamel("run", "-n", ns, "files/Java.java",
"-t", "pull-secret.enabled=true",
"-t",
"pull-secret.secret-name=dummy-secret").Execute()).To(Succeed())
// pod may not run because the pull secret is dummy
@@ -55,7 +55,7 @@ func TestPullSecretTrait(t *testing.T) {
})
t.Run("Explicity disable image pull secret", func(t *testing.T)
{
- Expect(Kamel("run", "-n", ns, "../files/Java.java",
+ Expect(Kamel("run", "-n", ns, "files/Java.java",
"-t",
"pull-secret.enabled=false").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "java"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
Eventually(IntegrationCondition(ns, "java",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
@@ -75,7 +75,7 @@ func TestPullSecretTrait(t *testing.T) {
if ocp {
// OpenShift always has an internal registry so image
pull secret is set by default
t.Run("Image pull secret is automatically set by
default", func(t *testing.T) {
- Expect(Kamel("run", "-n", ns,
"../files/Java.java").Execute()).To(Succeed())
+ Expect(Kamel("run", "-n", ns,
"files/Java.java").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "java"),
TestTimeoutLong).Should(Equal(v1.PodRunning))
Eventually(IntegrationCondition(ns, "java",
camelv1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
Eventually(IntegrationLogs(ns, "java"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
diff --git a/e2e/common/upgrade_test.go b/e2e/common/upgrade_test.go
index 9c493c7..4002f28 100644
--- a/e2e/common/upgrade_test.go
+++ b/e2e/common/upgrade_test.go
@@ -62,18 +62,18 @@ func TestIntegrationUpgrade(t *testing.T) {
Eventually(PlatformVersion(ns)).Should(Equal(defaults.Version))
// Run an integration
- Expect(Kamel("run", "-n", ns,
"files/js.js").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "js"),
TestTimeoutMedium).Should(Equal(v1.PodRunning))
- initialKit := IntegrationKit(ns, "js")()
+ Expect(Kamel("run", "-n", ns,
"files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "yaml"),
TestTimeoutMedium).Should(Equal(v1.PodRunning))
+ initialKit := IntegrationKit(ns, "yaml")()
// Scale the operator down to zero
Eventually(ScaleOperator(ns, 0)).Should(BeNil())
Eventually(OperatorPod(ns)).Should(BeNil())
// Change the version to an older one
- Expect(SetIntegrationVersion(ns, "js",
"an.older.one")).To(Succeed())
+ Expect(SetIntegrationVersion(ns, "yaml",
"an.older.one")).To(Succeed())
Expect(SetAllKitsVersion(ns, "an.older.one")).To(Succeed())
- Eventually(IntegrationVersion(ns,
"js")).Should(Equal("an.older.one"))
+ Eventually(IntegrationVersion(ns,
"yaml")).Should(Equal("an.older.one"))
Eventually(KitsWithVersion(ns, "an.older.one")).Should(Equal(1))
Eventually(KitsWithVersion(ns,
defaults.Version)).Should(Equal(0))
@@ -83,16 +83,16 @@ func TestIntegrationUpgrade(t *testing.T) {
Eventually(OperatorPodPhase(ns)).Should(Equal(v1.PodRunning))
// No auto-update expected
- Consistently(IntegrationVersion(ns, "js"),
3*time.Second).Should(Equal("an.older.one"))
+ Consistently(IntegrationVersion(ns, "yaml"),
3*time.Second).Should(Equal("an.older.one"))
// Clear the integration status
- Expect(Kamel("rebuild", "js", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("rebuild", "yaml", "-n",
ns).Execute()).To(Succeed())
// Check the integration version change
- Eventually(IntegrationVersion(ns,
"js")).Should(Equal(defaults.Version))
+ Eventually(IntegrationVersion(ns,
"yaml")).Should(Equal(defaults.Version))
Eventually(KitsWithVersion(ns,
"an.older.one")).Should(Equal(1)) // old one is not recycled
Eventually(KitsWithVersion(ns,
defaults.Version)).Should(Equal(1))
- Eventually(IntegrationKit(ns, "js"),
TestTimeoutMedium).ShouldNot(Equal(initialKit))
- Eventually(IntegrationPodPhase(ns, "js"),
TestTimeoutMedium).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationKit(ns, "yaml"),
TestTimeoutMedium).ShouldNot(Equal(initialKit))
+ Eventually(IntegrationPodPhase(ns, "yaml"),
TestTimeoutMedium).Should(Equal(v1.PodRunning))
})
}
