Tighten CasCTest by adding explicit definition of `inheritYamlMerge…

…Strategy` (#1619)
jenkinsci · Nov 6, 2024 · 2ab7579 · 2ab7579
1 parent 20a7e4d
commit 2ab7579
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/test/java/org/csanchez/jenkins/plugins/kubernetes/casc/CasCTest.java b/src/test/java/org/csanchez/jenkins/plugins/kubernetes/casc/CasCTest.java
@@ -45,6 +45,7 @@ protected void assertConfiguredAsExpected(RestartableJenkinsRule r, String confi
         assertEquals(5, podTemplate.getIdleMinutes());
         assertEquals(66, podTemplate.getActiveDeadlineSeconds());
         assertNull(podTemplate.getYamlMergeStrategy());
+        assertFalse(podTemplate.isInheritYamlMergeStrategy());
         assertThat(podTemplate.getResolvedYamlMergeStrategy(), isA(Overrides.class));
         podTemplate = templates.get(1);
         assertFalse(podTemplate.isHostNetwork());

diff --git a/src/test/resources/org/csanchez/jenkins/plugins/kubernetes/casc/configuration-as-code.yaml b/src/test/resources/org/csanchez/jenkins/plugins/kubernetes/casc/configuration-as-code.yaml
@@ -22,6 +22,7 @@ jenkins:
                 requestsSize: "1"
                 storageClassName: "hostpath"
             yamlMergeStrategy: "override"
+            inheritYamlMergeStrategy: false
           - containers:
               - args: "cat"
                 command: "/bin/sh -c"