Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes file locking issue in DependencyResourcesIT #3482

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class DependencyResourcesIT {
void k8sResource_whenRun_generatesK8sManifestsIncludingDependencies() throws IOException, ParseException {
// When
final BuildResult result = gradleRunner.withITProject("dependency-resources")
.withArguments("clean", "jar", "k8sResource", "--stacktrace")
.withArguments("jar", "k8sResource", "--stacktrace")
.build();
// Then
ResourceVerify.verifyResourceDescriptors(
Expand All @@ -49,12 +49,12 @@ void k8sResource_whenRun_generatesK8sManifestsIncludingDependencies() throws IOE
void k8sResource_whenRunWithReplicas_generatesK8sManifestsIncludingDependencies() throws IOException, ParseException {
// When
final BuildResult result = gradleRunner.withITProject("dependency-resources")
.withArguments("-Pjkube.replicas=1337", "clean", "jar", "k8sResource", "--stacktrace")
.withArguments("-Pjkube.targetDir=build/classes/java/main/META-INF/jkube-replicas-override", "-Pjkube.replicas=1337", "jar", "k8sResource", "--stacktrace")
.build();
// Then
ResourceVerify.verifyResourceDescriptors(
gradleRunner.resolveFile("dependent", "build", "classes", "java", "main",
"META-INF", "jkube", "kubernetes.yml"),
"META-INF", "jkube-replicas-override", "kubernetes.yml"),
gradleRunner.resolveFile("expected", "kubernetes-with-replica-override.yml"));
assertThat(result).extracting(BuildResult::getOutput).asString()
.contains("Using resource templates from")
Expand Down