automated commit

Signed-off-by: Public copy <41898282+github-actions[bot]@users.noreply.github.com>
chainguard-images · Aug 23, 2024 · 9113491 · 9113491
1 parent 5d4df0f
commit 9113491
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/images/gitlab-exporter/tests/main.tf b/images/gitlab-exporter/tests/main.tf
@@ -21,7 +21,7 @@ resource "imagetest_harness_k3s" "k3s" {
   name      = "gitlab-exporter-k3s"
   resources = {
     cpu = {
-      request = "8Gi"
+      request = "7"
     }
     memory = {
       request = "16Gi"
@@ -42,7 +42,7 @@ module "helm" {
   name    = "gitlab"
   repo    = "https://charts.gitlab.io"
   source  = "../../../tflib/imagetest/helm"
-  timeout = "20m"
+  timeout = "45m"
   values = {
     create_namespace = false
     global = {
@@ -148,6 +148,8 @@ resource "imagetest_feature" "k3s" {
   harness     = imagetest_harness_k3s.k3s
   labels = {
     type = "k8s"
+    # Group this image into a gitlab only shard
+    "shard::group" = "gitlab"
   }
   name = "Basic"
   steps = [
@@ -171,7 +173,7 @@ resource "imagetest_feature" "k3s" {
     }
   ]
   timeouts = {
-    create = "20m"
+    create = "45m"
   }
 }
 
diff --git a/images/gitlab-kas/tests/main.tf b/images/gitlab-kas/tests/main.tf
@@ -21,7 +21,7 @@ resource "imagetest_harness_k3s" "k3s" {
   name      = "gitlab-kas-k3s"
   resources = {
     cpu = {
-      request = "8Gi"
+      request = "7"
     }
     memory = {
       request = "16Gi"
@@ -42,7 +42,7 @@ module "helm" {
   name    = "gitlab"
   repo    = "https://charts.gitlab.io"
   source  = "../../../tflib/imagetest/helm"
-  timeout = "20m"
+  timeout = "45m"
   values = {
     create_namespace = false
     global = {
@@ -173,7 +173,7 @@ resource "imagetest_feature" "k3s" {
     }
   ]
   timeouts = {
-    create = "20m"
+    create = "45m"
   }
 }
 
diff --git a/images/gitlab-pages/tests/main.tf b/images/gitlab-pages/tests/main.tf
@@ -21,7 +21,7 @@ resource "imagetest_harness_k3s" "k3s" {
   name      = "gitlab-pages-k3s"
   resources = {
     cpu = {
-      request = "8Gi"
+      request = "7"
     }
     memory = {
       request = "16Gi"
@@ -42,7 +42,7 @@ module "helm" {
   name    = "gitlab"
   repo    = "https://charts.gitlab.io"
   source  = "../../../tflib/imagetest/helm"
-  timeout = "20m"
+  timeout = "45m"
   values = {
     create_namespace = false
     global = {
@@ -157,6 +157,8 @@ resource "imagetest_feature" "k3s" {
   harness     = imagetest_harness_k3s.k3s
   labels = {
     type = "k8s"
+    # Group this image into a gitlab only shard
+    "shard::group" = "gitlab"
   }
   name = "Basic"
   steps = [
@@ -180,7 +182,7 @@ resource "imagetest_feature" "k3s" {
     }
   ]
   timeouts = {
-    create = "20m"
+    create = "45m"
   }
 }
 
diff --git a/images/gitlab-shell/tests/main.tf b/images/gitlab-shell/tests/main.tf
@@ -21,7 +21,7 @@ resource "imagetest_harness_k3s" "this" {
   name      = "gitlab-shell"
   resources = {
     cpu = {
-      request = "8Gi"
+      request = "7"
     }
     memory = {
       request = "16Gi"
@@ -45,7 +45,7 @@ module "helm" {
   name    = "gitlab"
   repo    = "https://charts.gitlab.io"
   source  = "../../../tflib/imagetest/helm"
-  timeout = "20m"
+  timeout = "45m"
   values = {
     create_namespace = false
     global = {
@@ -157,6 +157,8 @@ resource "imagetest_feature" "k3s" {
   harness     = imagetest_harness_k3s.this
   labels = {
     type = "k8s"
+    # Group this image into a gitlab only shard
+    "shard::group" = "gitlab"
   }
   name = "Basic"
   steps = [
@@ -185,7 +187,7 @@ resource "imagetest_feature" "k3s" {
     },
   ]
   timeouts = {
-    create = "20m"
+    create = "45m"
   }
 }