Merge pull request #1645 from SaschaSchwarze0/sascha-fix-e2e

Pin to newer Node version that is still supported by Paketo
shipwright-io · Jul 15, 2024 · 42114d9 · 42114d9
2 parents 28d8b8b + 3575e2a
commit 42114d9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/test/e2e/v1alpha1/common_suite_test.go b/test/e2e/v1alpha1/common_suite_test.go
@@ -110,6 +110,14 @@ func (b *buildPrototype) Dockerfile(dockerfile string) *buildPrototype {
 	return b
 }
 
+func (b *buildPrototype) Env(key string, value string) *buildPrototype {
+	b.build.Spec.Env = append(b.build.Spec.Env, core.EnvVar{
+		Name:  key,
+		Value: value,
+	})
+	return b
+}
+
 func (b *buildPrototype) determineParameterIndex(name string) int {
 	index := -1
 	for i, paramValue := range b.build.Spec.ParamValues {

diff --git a/test/e2e/v1alpha1/e2e_image_mutate_test.go b/test/e2e/v1alpha1/e2e_image_mutate_test.go
@@ -181,6 +181,7 @@ var _ = Describe("For a Kubernetes cluster with Tekton and build installed", fun
 						OutputImageCredentials(os.Getenv(EnvVarImageRepoSecret)).
 						OutputImageInsecure(insecure).
 						OutputTimestamp(outputTimestamp).
+						Env("BP_NODE_VERSION", "~20").
 						BuildSpec()).
 					MustCreate()
 			}

diff --git a/test/e2e/v1beta1/common_suite_test.go b/test/e2e/v1beta1/common_suite_test.go
@@ -154,6 +154,14 @@ func (b *buildPrototype) OutputImage(image string) *buildPrototype {
 	return b
 }
 
+func (b *buildPrototype) Env(key string, value string) *buildPrototype {
+	b.build.Spec.Env = append(b.build.Spec.Env, core.EnvVar{
+		Name:  key,
+		Value: value,
+	})
+	return b
+}
+
 func (b *buildPrototype) OutputVulnerabilitySettings(settings buildv1beta1.VulnerabilityScanOptions) *buildPrototype {
 	b.build.Spec.Output.VulnerabilityScan = &settings
 	return b

diff --git a/test/e2e/v1beta1/e2e_image_mutate_test.go b/test/e2e/v1beta1/e2e_image_mutate_test.go
@@ -181,6 +181,7 @@ var _ = Describe("For a Kubernetes cluster with Tekton and build installed", fun
 						OutputImageCredentials(os.Getenv(EnvVarImageRepoSecret)).
 						OutputImageInsecure(insecure).
 						OutputTimestamp(outputTimestamp).
+						Env("BP_NODE_VERSION", "~20").
 						BuildSpec()).
 					MustCreate()
 			}