Only apply PodTemplate and ComputeResources for CI Tests

Author: rnc

openshift-with-appstudio-test/e2e/util.go

@@ -1064,9 +1064,10 @@ func setupMinikube(t *testing.T, namespace string) *testArgs {
 	}
 	jbsConfig := v1alpha1.JBSConfig{
 		ObjectMeta: metav1.ObjectMeta{
-			Namespace:   ta.ns,
-			Name:        v1alpha1.JBSConfigName,
-			Annotations: map[string]string{jbsconfig.TestRegistry: strconv.FormatBool(insecure)},
+			Namespace: ta.ns,
+			Name:      v1alpha1.JBSConfigName,
+			Annotations: map[string]string{jbsconfig.TestRegistry: strconv.FormatBool(insecure),
+				jbsconfig.CITests: "true"},
 		},
 		Spec: v1alpha1.JBSConfigSpec{
 			EnableRebuilds:    true,

pkg/reconciler/dependencybuild/dependencybuild.go

@@ -636,29 +636,30 @@ func (r *ReconcileDependencyBuild) handleStateBuilding(ctx context.Context, db *
 			},
 		}},
 	}
-	// TODO: ### Enclose this within an annotation to denote test CI system in use?
-	pr.Spec.TaskRunTemplate = tektonpipeline.PipelineTaskRunTemplate{
-		PodTemplate: &pod.Template{
-			Env: []v1.EnvVar{
-				{
-					Name:  "ORAS_OPTIONS",
-					Value: orasOptions,
+	if orasOptions != "" {
+		pr.Spec.TaskRunTemplate = tektonpipeline.PipelineTaskRunTemplate{
+			PodTemplate: &pod.Template{
+				Env: []v1.EnvVar{
+					{
+						Name:  "ORAS_OPTIONS",
+						Value: orasOptions,
+					},
 				},
 			},
-		},
+		}
+	}
+	if jbsConfig.Annotations != nil && jbsConfig.Annotations[jbsconfig.CITests] == "true" {
+		podMemR, _ := resource.ParseQuantity("1792Mi")
+		podMemL, _ := resource.ParseQuantity("3584Mi")
+		podCPU, _ := resource.ParseQuantity("500m")
+		pr.Spec.TaskRunSpecs = []tektonpipeline.PipelineTaskRunSpec{{
+			PipelineTaskName: BuildTaskName,
+			ComputeResources: &v1.ResourceRequirements{
+				Requests: v1.ResourceList{"memory": podMemR, "cpu": podCPU},
+				Limits:   v1.ResourceList{"memory": podMemL, "cpu": podCPU},
+			},
+		}}
 	}
-	// TODO: ### Enclose this within an annotation to denote test CI system in use?
-	podMemR, _ := resource.ParseQuantity("1792Mi")
-	podMemL, _ := resource.ParseQuantity("3584Mi")
-	podCPU, _ := resource.ParseQuantity("500m")
-	pr.Spec.TaskRunSpecs = []tektonpipeline.PipelineTaskRunSpec{{
-		PipelineTaskName: BuildTaskName,
-		ComputeResources: &v1.ResourceRequirements{
-			Requests: v1.ResourceList{"memory": podMemR, "cpu": podCPU},
-			Limits:   v1.ResourceList{"memory": podMemL, "cpu": podCPU},
-		},
-	}}
-
 	if !jbsConfig.Spec.CacheSettings.DisableTLS {
 		pr.Spec.Workspaces = append(pr.Spec.Workspaces, tektonpipeline.WorkspaceBinding{Name: "tls", ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: v1alpha1.TlsConfigMapName}}})
 	} else {
@@ -1422,10 +1423,6 @@ func (r *ReconcileDependencyBuild) handleStateDeploying(ctx context.Context, db
 		{Name: PipelineResultPreBuildImageDigest, Value: tektonpipeline.ResultValue{Type: tektonpipeline.ParamTypeString, StringVal: db.Status.PreBuildImages[len(db.Status.PreBuildImages)-1].BuiltImageDigest}},
 	}
 
-	orasOptions := ""
-	if jbsConfig.Annotations != nil && jbsConfig.Annotations[jbsconfig.TestRegistry] == "true" {
-		orasOptions = "--insecure --plain-http"
-	}
 	systemConfig := v1alpha1.SystemConfig{}
 	err = r.client.Get(ctx, types.NamespacedName{Name: systemconfig.SystemConfigKey}, &systemConfig)
 	if err != nil {
@@ -1450,28 +1447,29 @@ func (r *ReconcileDependencyBuild) handleStateDeploying(ctx context.Context, db
 		pr.Spec.Workspaces = append(pr.Spec.Workspaces, tektonpipeline.WorkspaceBinding{Name: "tls", EmptyDir: &v1.EmptyDirVolumeSource{}})
 	}
 	pr.Spec.Timeouts = &tektonpipeline.TimeoutFields{Pipeline: &v12.Duration{Duration: time.Hour * v1alpha1.DefaultTimeout}}
-	// TODO: ### Enclose this within an annotation to denote test CI system in use? Could inline orasOptions then as well?
-	pr.Spec.TaskRunTemplate = tektonpipeline.PipelineTaskRunTemplate{
-		PodTemplate: &pod.Template{
-			Env: []v1.EnvVar{
-				{
-					Name:  "ORAS_OPTIONS",
-					Value: orasOptions,
+	if jbsConfig.Annotations != nil && jbsConfig.Annotations[jbsconfig.TestRegistry] == "true" {
+		pr.Spec.TaskRunTemplate = tektonpipeline.PipelineTaskRunTemplate{
+			PodTemplate: &pod.Template{
+				Env: []v1.EnvVar{
+					{
+						Name:  "ORAS_OPTIONS",
+						Value: "--insecure --plain-http",
+					},
 				},
 			},
-		},
+		}
+	}
+	if jbsConfig.Annotations != nil && jbsConfig.Annotations[jbsconfig.CITests] == "true" {
+		podMem, _ := resource.ParseQuantity("1024Mi")
+		podCPU, _ := resource.ParseQuantity("250m")
+		pr.Spec.TaskRunSpecs = []tektonpipeline.PipelineTaskRunSpec{{
+			PipelineTaskName: DeployTaskName,
+			ComputeResources: &v1.ResourceRequirements{
+				Requests: v1.ResourceList{"memory": podMem, "cpu": podCPU},
+				Limits:   v1.ResourceList{"memory": podMem, "cpu": podCPU},
+			},
+		}}
 	}
-	// TODO: ### Enclose this within an annotation to denote test CI system in use?
-	podMem, _ := resource.ParseQuantity("1024Mi")
-	podCPU, _ := resource.ParseQuantity("250m")
-	pr.Spec.TaskRunSpecs = []tektonpipeline.PipelineTaskRunSpec{{
-		PipelineTaskName: DeployTaskName,
-		ComputeResources: &v1.ResourceRequirements{
-			Requests: v1.ResourceList{"memory": podMem, "cpu": podCPU},
-			Limits:   v1.ResourceList{"memory": podMem, "cpu": podCPU},
-		},
-	}}
-
 	if err := controllerutil.SetOwnerReference(db, &pr, r.scheme); err != nil {
 		return reconcile.Result{}, err
 	}

pkg/reconciler/jbsconfig/jbsconfig.go

@@ -35,6 +35,7 @@ import (
 
 const (
 	TlsServiceName            = v1alpha1.CacheDeploymentName + "-tls"
+	CITests                   = "jvmbuildservice.io/ci-tests"      // Denote using an insecure registry in GitHub Actions
 	TestRegistry              = "jvmbuildservice.io/test-registry" // Denote using an insecure registry in GitHub Actions
 	RetryTimeAnnotations      = "jvmbuildservice.io/retry-time"
 	RetryTimestampAnnotations = "jvmbuildservice.io/retry-timestamp"