update test to use branch override label

tag1consulting · Sep 27, 2024 · 53e061f · 53e061f
1 parent 8e060c6
commit 53e061f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/cmd/template_lagoonservices_test.go b/cmd/template_lagoonservices_test.go
@@ -489,13 +489,6 @@ func TestTemplateLagoonServices(t *testing.T) {
 					EnvironmentName: "main",
 					Branch:          "main",
 					LagoonYAML:      "internal/testdata/complex/lagoon.resources.yml",
-					EnvVariables: []lagoon.EnvironmentVariable{
-						{
-							Name:  "NGINX_CPU_REQUEST",
-							Value: "50m",
-							Scope: "global",
-						},
-					},
 					ImageReferences: map[string]string{
 						"nginx": "harbor.example/example-project/main/nginx@sha256:b2001babafaa8128fe89aa8fd11832cade59931d14c3de5b3ca32e2a010fbaa8",
 						"php":   "harbor.example/example-project/main/php@sha256:b2001babafaa8128fe89aa8fd11832cade59931d14c3de5b3ca32e2a010fbaa8",

diff --git a/internal/testdata/complex/docker-compose.resources.yml b/internal/testdata/complex/docker-compose.resources.yml
@@ -70,9 +70,9 @@ services:
       lagoon.persistent: /app/docroot/sites/default/files/
       lagoon.persistent.size: 5Gi
       lagoon.name: nginx-php
-      # NGINX_CPU_REQUEST is injected as project env in test
-      lagoon.resources.requests.cpu: ${NGINX_CPU_REQUEST}
+      lagoon.resources.requests.cpu: 10m
       lagoon.resources.limits.cpu: 100m
+      lagoon.resources.override-branch.main.requests.cpu: 50m
     expose:
       - "8080"
   php: