This is an automated email from the ASF dual-hosted git repository.
squakez pushed a commit to branch release-2.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-2.10.x by this push:
new 4d2c91913 chore(ci): sync conf for maven allow list
4d2c91913 is described below
commit 4d2c91913d0192bbb33684eba49d4c994a6f2337
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Sat Aug 29 09:32:59 2026 +0200
chore(ci): sync conf for maven allow list
---
.github/workflows/common.yml | 3 ++
e2e/advanced/builder_test.go | 84 --------------------------------------------
2 files changed, 3 insertions(+), 84 deletions(-)
diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
index 4746c54f6..4b776f2a8 100644
--- a/.github/workflows/common.yml
+++ b/.github/workflows/common.yml
@@ -73,6 +73,9 @@ jobs:
- name: Install operator
shell: bash
run: |
+ # add an env var to include testing maven repo
+ sed -i '/^ value: "camel\.apache\.org\/app"$/a\
- name: MAVEN_REPOSITORIES_ALLOWED\n value:
"https://maven.repository.redhat.com/ga@id=redhat";' \
+ ./install/base/config/manager/operator-deployment.yaml
kubectl create ns camel-k
make install-k8s-global
kubectl wait --for=jsonpath='{.status.phase}'=Ready itp camel-k -n
camel-k --timeout=60s
diff --git a/e2e/advanced/builder_test.go b/e2e/advanced/builder_test.go
index 3b33c58ad..69c3061b8 100644
--- a/e2e/advanced/builder_test.go
+++ b/e2e/advanced/builder_test.go
@@ -78,87 +78,3 @@ func TestBuilderTimeout(t *testing.T) {
})
})
}
-
-func TestMavenProfile(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) {
- InstallOperator(t, ctx, g, ns)
- t.Run("Run maven profile", func(t *testing.T) {
- name := RandomizedSuffixName("java-maven-profile")
-
- mavenProfile1Cm := newMavenProfileConfigMap(ns,
"maven-profile-owasp", "owasp-profile")
- g.Expect(TestClient(t).Create(ctx,
mavenProfile1Cm)).To(Succeed())
- mavenProfile2Cm := newMavenProfileConfigMap(ns,
"maven-profile-dependency", "dependency-profile")
- g.Expect(TestClient(t).Create(ctx,
mavenProfile2Cm)).To(Succeed())
-
- g.Expect(KamelRun(t, ctx, ns, "files/Java.java",
"--name", name, "-t",
"builder.maven-profiles=configmap:maven-profile-owasp/owasp-profile", "-t",
"builder.maven-profiles=configmap:maven-profile-dependency/dependency-profile",
"-t", "builder.tasks=custom1;alpine;cat maven/pom.xml", "-t",
"builder.strategy=pod").Execute()).To(Succeed())
-
- g.Eventually(IntegrationPodPhase(t, ctx, ns, name),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns,
name, v1.IntegrationConditionReady),
TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns, name),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- integrationKitName := IntegrationKit(t, ctx, ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(t,
ctx, ns, name)()
- builderKitName := fmt.Sprintf("camel-k-%s-builder",
integrationKitName)
- g.Eventually(BuilderPod(t, ctx,
integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
- g.Eventually(len(BuilderPod(t, ctx,
integrationKitNamespace, builderKitName)().Spec.InitContainers),
TestTimeoutShort).Should(Equal(3))
- g.Eventually(BuilderPod(t, ctx,
integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name,
TestTimeoutShort).Should(Equal("builder"))
- g.Eventually(BuilderPod(t, ctx,
integrationKitNamespace, builderKitName)().Spec.InitContainers[1].Name,
TestTimeoutShort).Should(Equal("custom1"))
- g.Eventually(BuilderPod(t, ctx,
integrationKitNamespace, builderKitName)().Spec.InitContainers[2].Name,
TestTimeoutShort).Should(Equal("package"))
-
- // Check containers conditions
- g.Eventually(Build(t, ctx, integrationKitNamespace,
integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
- g.Eventually(
- Build(t, ctx, integrationKitNamespace,
integrationKitName)().Status.GetCondition(v1.BuildConditionType("Containercustom1Succeeded")).Status,
-
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(
- Build(t, ctx, integrationKitNamespace,
integrationKitName)().Status.GetCondition(v1.BuildConditionType("Containercustom1Succeeded")).Message,
-
TestTimeoutShort).Should(ContainSubstring("</project>"))
-
- // Check logs
- g.Eventually(Logs(t, ctx, integrationKitNamespace,
builderKitName, corev1.PodLogOptions{Container:
"custom1"})).Should(ContainSubstring(`<id>owasp-profile</id>`))
- g.Eventually(Logs(t, ctx, integrationKitNamespace,
builderKitName, corev1.PodLogOptions{Container:
"custom1"})).Should(ContainSubstring(`<id>dependency-profile</id>`))
-
- g.Expect(TestClient(t).Delete(ctx,
mavenProfile1Cm)).To(Succeed())
- g.Expect(TestClient(t).Delete(ctx,
mavenProfile2Cm)).To(Succeed())
- })
- })
-}
-
-func newMavenProfileConfigMap(ns, name, key string) *corev1.ConfigMap {
- return &corev1.ConfigMap{
- TypeMeta: metav1.TypeMeta{
- Kind: "ConfigMap",
- APIVersion: corev1.SchemeGroupVersion.String(),
- },
- ObjectMeta: metav1.ObjectMeta{
- Namespace: ns,
- Name: name,
- },
- Data: map[string]string{
- key: fmt.Sprintf(`
-<profile>
- <id>%s</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.owasp</groupId>
- <artifactId>dependency-check-maven</artifactId>
- <version>5.3.0</version>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</profile>
-`, key,
- ),
- },
- }
-}
