Add missing annotation. Add logging.

Author: rnc

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

@@ -8,5 +8,5 @@ import (
 )
 
 func TestExampleRun(t *testing.T) {
-	runBasicTests(t, setup, testNamespace)
+	runBasicTests(t, setupE2E, testNamespace)
 }

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

@@ -20,7 +20,7 @@ import (
 )
 
 func runTests(t *testing.T, namespace string, runYaml string) {
-	ta := setup(t, namespace)
+	ta := setupE2E(t, namespace)
 
 	countQuota := &corev1.ResourceQuota{
 		ObjectMeta: metav1.ObjectMeta{

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

@@ -243,11 +243,7 @@ func commonSetup(t *testing.T, gitCloneUrl string, namespace string) *testArgs {
 	}
 	return ta
 }
-func setup(t *testing.T, namespace string) *testArgs {
-	return setupConfig(t, namespace)
-}
-func setupConfig(t *testing.T, namespace string) *testArgs {
-
+func setupE2E(t *testing.T, namespace string) *testArgs {
 	ta := commonSetup(t, gitCloneTaskUrl, namespace)
 	err := wait.PollUntilContextTimeout(context.TODO(), 1*time.Second, 1*time.Minute, true, func(ctx context.Context) (done bool, err error) {
 		_, err = kubeClient.CoreV1().ServiceAccounts(ta.ns).Get(context.TODO(), "pipeline", metav1.GetOptions{})
@@ -292,8 +288,9 @@ func setupConfig(t *testing.T, namespace string) *testArgs {
 
 	jbsConfig := v1alpha1.JBSConfig{
 		ObjectMeta: metav1.ObjectMeta{
-			Namespace: ta.ns,
-			Name:      v1alpha1.JBSConfigName,
+			Namespace:   ta.ns,
+			Name:        v1alpha1.JBSConfigName,
+			Annotations: map[string]string{jbsconfig.CITests: "true"},
 		},
 		Spec: v1alpha1.JBSConfigSpec{
 			EnableRebuilds: true,
@@ -1066,8 +1063,9 @@ func setupMinikube(t *testing.T, namespace string) *testArgs {
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: ta.ns,
 			Name:      v1alpha1.JBSConfigName,
-			Annotations: map[string]string{jbsconfig.TestRegistry: strconv.FormatBool(insecure),
-				jbsconfig.CITests: "true"},
+			Annotations: map[string]string{
+				jbsconfig.TestRegistry: strconv.FormatBool(insecure),
+				jbsconfig.CITests:      "true"},
 		},
 		Spec: v1alpha1.JBSConfigSpec{
 			EnableRebuilds:    true,

pkg/reconciler/dependencybuild/dependencybuild.go

@@ -649,6 +649,7 @@ func (r *ReconcileDependencyBuild) handleStateBuilding(ctx context.Context, db *
 		}
 	}
 	if jbsConfig.Annotations != nil && jbsConfig.Annotations[jbsconfig.CITests] == "true" {
+		log.Info(fmt.Sprintf("Configuring resources for %#v", BuildTaskName))
 		podMemR, _ := resource.ParseQuantity("1792Mi")
 		podMemL, _ := resource.ParseQuantity("3584Mi")
 		podCPU, _ := resource.ParseQuantity("500m")
@@ -1460,6 +1461,7 @@ func (r *ReconcileDependencyBuild) handleStateDeploying(ctx context.Context, db
 		}
 	}
 	if jbsConfig.Annotations != nil && jbsConfig.Annotations[jbsconfig.CITests] == "true" {
+		log.Info(fmt.Sprintf("Configuring resources for %#v", DeployTaskName))
 		podMem, _ := resource.ParseQuantity("1024Mi")
 		podCPU, _ := resource.ParseQuantity("250m")
 		pr.Spec.TaskRunSpecs = []tektonpipeline.PipelineTaskRunSpec{{