Smbaker/component test diags (#326)

Co-authored-by: Gupta, Gunjan <gunjan.gupta@intel.com>
Co-authored-by: guptagunjan <88308027+guptagunjan@users.noreply.github.com>

Author: scottmbaker

.github/workflows/adm-component-test.yml

@@ -19,7 +19,7 @@ on:
         description: 'The branch, tag or SHA to checkout EMF'
         required: true
         type: string
-        default: '51d847c5b3a831454981f5fce7cecbbe1ade5e87'
+        default: main
 permissions:
   contents: read
 
@@ -31,6 +31,6 @@ jobs:
     uses: ./.github/workflows/common-comp-tests.yml
     with:
       component: app-deployment-manager
-      use-enic: true
-      emf-branch: ${{ inputs.emf-branch || '51d847c5b3a831454981f5fce7cecbbe1ade5e87' }}
+      use-ven: true
+      emf-branch: ${{ inputs.emf-branch || 'main' }}
     secrets: inherit  # zizmor: ignore[secrets-inherit]

.github/workflows/arm-component-test.yml

@@ -19,7 +19,7 @@ on:
         description: 'The branch, tag or SHA to checkout EMF'
         required: true
         type: string
-        default: '51d847c5b3a831454981f5fce7cecbbe1ade5e87'
+        default: main
 permissions:
   contents: read
 
@@ -30,6 +30,6 @@ jobs:
     uses: ./.github/workflows/common-comp-tests.yml
     with:
       component: app-resource-manager
-      use-enic: true
-      emf-branch: ${{ inputs.emf-branch || '51d847c5b3a831454981f5fce7cecbbe1ade5e87' }}
+      use-ven: true
+      emf-branch: ${{ inputs.emf-branch || 'main' }}
     secrets: inherit  # zizmor: ignore[secrets-inherit]

.github/workflows/asp-component-test.yml

@@ -19,7 +19,7 @@ on:
         description: 'The branch, tag or SHA to checkout EMF'
         required: true
         type: string
-        default: 'b3c4815fe5a221d827886bba0563dacc26f2ae2a'
+        default: main
 permissions:
   contents: read
 
@@ -60,6 +60,6 @@ jobs:
     uses: ./.github/workflows/common-comp-tests.yml
     with:
       component: app-service-proxy
-      use-enic: true
-      emf-branch: ${{ inputs.emf-branch || 'b3c4815fe5a221d827886bba0563dacc26f2ae2a' }}
+      use-ven: true
+      emf-branch: ${{ inputs.emf-branch || 'main' }}
     secrets: inherit  # zizmor: ignore[secrets-inherit]

.github/workflows/common-comp-tests.yml

@@ -178,8 +178,8 @@ test: manifests fmt vet envtest opa-test ## Run tests
 	go tool cover -html=cover.out -o coverage.html
 
 COMP_TEST_COVER := atomic ./test/...
-PARALLEL_TESTS := 10
-PARALLEL_SUITES := 10
+PARALLEL_TESTS := 1
+PARALLEL_SUITES := 1
 component-test: common-component-test ## Run component tests
 
 go-fuzz: FUZZ_FUNCS ?= FuzzCreateDeployment FuzzListDeployments$$ FuzzGetDeployment FuzzDeleteDeployment \

app-deployment-manager/Makefile

@@ -1378,154 +1378,154 @@ var _ = Describe("Deployment controller", func() {
 	})
 
 	When("cleaning up removed target clusters", func() {
-	var (
-	ctx context.Context
-	r   *Reconciler
-	c   client.WithWatch
-	d   v1beta1.Deployment
-	dc1 v1beta1.DeploymentCluster
-	dc2 v1beta1.DeploymentCluster
-	dc3 v1beta1.DeploymentCluster
-	)
+		var (
+			ctx context.Context
+			r   *Reconciler
+			c   client.WithWatch
+			d   v1beta1.Deployment
+			dc1 v1beta1.DeploymentCluster
+			dc2 v1beta1.DeploymentCluster
+			dc3 v1beta1.DeploymentCluster
+		)
 
-	BeforeEach(func() {
-	ctx = context.Background()
-
-	d = v1beta1.Deployment{
-	ObjectMeta: metav1.ObjectMeta{
-	Name:      "test-deployment",
-	Namespace: "default",
-	UID:       "test-uid-12345",
-	},
-	Spec: v1beta1.DeploymentSpec{
-	DeploymentType: v1beta1.Targeted,
-	Applications: []v1beta1.Application{
-	{
-	Name:      "app1",
-	Version:   "1.0.0",
-	Namespace: "default",
-	Targets: []map[string]string{
-	{string(v1beta1.ClusterName): "cluster-1"},
-	{string(v1beta1.ClusterName): "cluster-2"},
-	},
-	},
-	},
-	},
-	}
+		BeforeEach(func() {
+			ctx = context.Background()
 
-	dc1 = v1beta1.DeploymentCluster{
-	ObjectMeta: metav1.ObjectMeta{
-	Name:      "test-deployment-cluster-1",
-	Namespace: "default",
-	Labels: map[string]string{
-	string(v1beta1.BundleName):   "test-deployment",
-	string(v1beta1.DeploymentID): "test-uid-12345",
-	},
-	OwnerReferences: []metav1.OwnerReference{
-	{APIVersion: "app.edge-orchestrator.intel.com/v1beta1", Kind: "Deployment", Name: "test-deployment", UID: "test-uid-12345"},
-	},
-	},
-	Spec: v1beta1.DeploymentClusterSpec{ClusterID: "cluster-1"},
-	}
+			d = v1beta1.Deployment{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-deployment",
+					Namespace: "default",
+					UID:       "test-uid-12345",
+				},
+				Spec: v1beta1.DeploymentSpec{
+					DeploymentType: v1beta1.Targeted,
+					Applications: []v1beta1.Application{
+						{
+							Name:      "app1",
+							Version:   "1.0.0",
+							Namespace: "default",
+							Targets: []map[string]string{
+								{string(v1beta1.ClusterName): "cluster-1"},
+								{string(v1beta1.ClusterName): "cluster-2"},
+							},
+						},
+					},
+				},
+			}
 
-	dc2 = v1beta1.DeploymentCluster{
-	ObjectMeta: metav1.ObjectMeta{
-	Name:      "test-deployment-cluster-2",
-	Namespace: "default",
-	Labels: map[string]string{
-	string(v1beta1.BundleName):   "test-deployment",
-	string(v1beta1.DeploymentID): "test-uid-12345",
-	},
-	OwnerReferences: []metav1.OwnerReference{
-	{APIVersion: "app.edge-orchestrator.intel.com/v1beta1", Kind: "Deployment", Name: "test-deployment", UID: "test-uid-12345"},
-	},
-	},
-	Spec: v1beta1.DeploymentClusterSpec{ClusterID: "cluster-2"},
-	}
+			dc1 = v1beta1.DeploymentCluster{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-deployment-cluster-1",
+					Namespace: "default",
+					Labels: map[string]string{
+						string(v1beta1.BundleName):   "test-deployment",
+						string(v1beta1.DeploymentID): "test-uid-12345",
+					},
+					OwnerReferences: []metav1.OwnerReference{
+						{APIVersion: "app.edge-orchestrator.intel.com/v1beta1", Kind: "Deployment", Name: "test-deployment", UID: "test-uid-12345"},
+					},
+				},
+				Spec: v1beta1.DeploymentClusterSpec{ClusterID: "cluster-1"},
+			}
 
-	dc3 = v1beta1.DeploymentCluster{
-	ObjectMeta: metav1.ObjectMeta{
-	Name:      "test-deployment-cluster-3",
-	Namespace: "default",
-	Labels: map[string]string{
-	string(v1beta1.BundleName):   "test-deployment",
-	string(v1beta1.DeploymentID): "test-uid-12345",
-	},
-	OwnerReferences: []metav1.OwnerReference{
-	{APIVersion: "app.edge-orchestrator.intel.com/v1beta1", Kind: "Deployment", Name: "test-deployment", UID: "test-uid-12345"},
-	},
-	},
-	Spec: v1beta1.DeploymentClusterSpec{ClusterID: "cluster-3"},
-	}
+			dc2 = v1beta1.DeploymentCluster{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-deployment-cluster-2",
+					Namespace: "default",
+					Labels: map[string]string{
+						string(v1beta1.BundleName):   "test-deployment",
+						string(v1beta1.DeploymentID): "test-uid-12345",
+					},
+					OwnerReferences: []metav1.OwnerReference{
+						{APIVersion: "app.edge-orchestrator.intel.com/v1beta1", Kind: "Deployment", Name: "test-deployment", UID: "test-uid-12345"},
+					},
+				},
+				Spec: v1beta1.DeploymentClusterSpec{ClusterID: "cluster-2"},
+			}
 
-	c = fake.NewClientBuilder().
-	WithScheme(scheme.Scheme).
-	WithObjects(&d, &dc1, &dc2, &dc3).
-	WithStatusSubresource(&v1beta1.Deployment{}).
-	Build()
+			dc3 = v1beta1.DeploymentCluster{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-deployment-cluster-3",
+					Namespace: "default",
+					Labels: map[string]string{
+						string(v1beta1.BundleName):   "test-deployment",
+						string(v1beta1.DeploymentID): "test-uid-12345",
+					},
+					OwnerReferences: []metav1.OwnerReference{
+						{APIVersion: "app.edge-orchestrator.intel.com/v1beta1", Kind: "Deployment", Name: "test-deployment", UID: "test-uid-12345"},
+					},
+				},
+				Spec: v1beta1.DeploymentClusterSpec{ClusterID: "cluster-3"},
+			}
 
-	r = &Reconciler{
-	Client:   c,
-	Scheme:   scheme.Scheme,
-	recorder: record.NewFakeRecorder(1024),
-	}
-	})
+			c = fake.NewClientBuilder().
+				WithScheme(scheme.Scheme).
+				WithObjects(&d, &dc1, &dc2, &dc3).
+				WithStatusSubresource(&v1beta1.Deployment{}).
+				Build()
 
-	Context("when cluster is removed from targeted deployment", func() {
-	It("should delete the DeploymentCluster for removed cluster", func() {
-	err := r.cleanupRemovedTargetClusters(ctx, &d)
-	Expect(err).NotTo(HaveOccurred())
+			r = &Reconciler{
+				Client:   c,
+				Scheme:   scheme.Scheme,
+				recorder: record.NewFakeRecorder(1024),
+			}
+		})
 
-	err = r.Get(ctx, types.NamespacedName{Name: dc1.Name, Namespace: dc1.Namespace}, &dc1)
-	Expect(err).NotTo(HaveOccurred())
+		Context("when cluster is removed from targeted deployment", func() {
+			It("should delete the DeploymentCluster for removed cluster", func() {
+				err := r.cleanupRemovedTargetClusters(ctx, &d)
+				Expect(err).NotTo(HaveOccurred())
 
-	err = r.Get(ctx, types.NamespacedName{Name: dc2.Name, Namespace: dc2.Namespace}, &dc2)
-	Expect(err).NotTo(HaveOccurred())
+				err = r.Get(ctx, types.NamespacedName{Name: dc1.Name, Namespace: dc1.Namespace}, &dc1)
+				Expect(err).NotTo(HaveOccurred())
 
-	err = r.Get(ctx, types.NamespacedName{Name: dc3.Name, Namespace: dc3.Namespace}, &dc3)
-	Expect(apierrors.IsNotFound(err)).To(BeTrue())
-	})
-	})
+				err = r.Get(ctx, types.NamespacedName{Name: dc2.Name, Namespace: dc2.Namespace}, &dc2)
+				Expect(err).NotTo(HaveOccurred())
 
-	Context("when deployment is auto-scaling type", func() {
-	It("should not delete any DeploymentClusters", func() {
-	d.Spec.DeploymentType = v1beta1.AutoScaling
-	err := c.Update(ctx, &d)
-	Expect(err).NotTo(HaveOccurred())
+				err = r.Get(ctx, types.NamespacedName{Name: dc3.Name, Namespace: dc3.Namespace}, &dc3)
+				Expect(apierrors.IsNotFound(err)).To(BeTrue())
+			})
+		})
 
-	err = r.cleanupRemovedTargetClusters(ctx, &d)
-	Expect(err).NotTo(HaveOccurred())
+		Context("when deployment is auto-scaling type", func() {
+			It("should not delete any DeploymentClusters", func() {
+				d.Spec.DeploymentType = v1beta1.AutoScaling
+				err := c.Update(ctx, &d)
+				Expect(err).NotTo(HaveOccurred())
 
-	err = r.Get(ctx, types.NamespacedName{Name: dc1.Name, Namespace: dc1.Namespace}, &dc1)
-	Expect(err).NotTo(HaveOccurred())
+				err = r.cleanupRemovedTargetClusters(ctx, &d)
+				Expect(err).NotTo(HaveOccurred())
 
-	err = r.Get(ctx, types.NamespacedName{Name: dc2.Name, Namespace: dc2.Namespace}, &dc2)
-	Expect(err).NotTo(HaveOccurred())
+				err = r.Get(ctx, types.NamespacedName{Name: dc1.Name, Namespace: dc1.Namespace}, &dc1)
+				Expect(err).NotTo(HaveOccurred())
 
-	err = r.Get(ctx, types.NamespacedName{Name: dc3.Name, Namespace: dc3.Namespace}, &dc3)
-	Expect(err).NotTo(HaveOccurred())
-	})
-	})
+				err = r.Get(ctx, types.NamespacedName{Name: dc2.Name, Namespace: dc2.Namespace}, &dc2)
+				Expect(err).NotTo(HaveOccurred())
 
-	Context("when all clusters are removed from deployment", func() {
-	It("should delete all DeploymentClusters", func() {
-	d.Spec.Applications[0].Targets = []map[string]string{}
-	err := c.Update(ctx, &d)
-	Expect(err).NotTo(HaveOccurred())
+				err = r.Get(ctx, types.NamespacedName{Name: dc3.Name, Namespace: dc3.Namespace}, &dc3)
+				Expect(err).NotTo(HaveOccurred())
+			})
+		})
 
-	err = r.cleanupRemovedTargetClusters(ctx, &d)
-	Expect(err).NotTo(HaveOccurred())
+		Context("when all clusters are removed from deployment", func() {
+			It("should delete all DeploymentClusters", func() {
+				d.Spec.Applications[0].Targets = []map[string]string{}
+				err := c.Update(ctx, &d)
+				Expect(err).NotTo(HaveOccurred())
 
-	err = r.Get(ctx, types.NamespacedName{Name: dc1.Name, Namespace: dc1.Namespace}, &dc1)
-	Expect(apierrors.IsNotFound(err)).To(BeTrue())
+				err = r.cleanupRemovedTargetClusters(ctx, &d)
+				Expect(err).NotTo(HaveOccurred())
 
-	err = r.Get(ctx, types.NamespacedName{Name: dc2.Name, Namespace: dc2.Namespace}, &dc2)
-	Expect(apierrors.IsNotFound(err)).To(BeTrue())
+				err = r.Get(ctx, types.NamespacedName{Name: dc1.Name, Namespace: dc1.Namespace}, &dc1)
+				Expect(apierrors.IsNotFound(err)).To(BeTrue())
 
-	err = r.Get(ctx, types.NamespacedName{Name: dc3.Name, Namespace: dc3.Namespace}, &dc3)
-	Expect(apierrors.IsNotFound(err)).To(BeTrue())
-	})
-	})
+				err = r.Get(ctx, types.NamespacedName{Name: dc2.Name, Namespace: dc2.Namespace}, &dc2)
+				Expect(apierrors.IsNotFound(err)).To(BeTrue())
+
+				err = r.Get(ctx, types.NamespacedName{Name: dc3.Name, Namespace: dc3.Namespace}, &dc3)
+				Expect(apierrors.IsNotFound(err)).To(BeTrue())
+			})
+		})
 	})
 
 })

app-deployment-manager/controllers/deployment/deployment_controller_test.go

@@ -12,7 +12,7 @@ import (
 
 // TestListDeploymentsInvalidProjectID tests the list deployments method with invalid project ID
 func (s *TestSuite) TestListDeploymentsInvalidProjectID() {
-	s.T().Parallel()
+	// s.T().Parallel() // Disabled to run tests sequentially
 	admClient, err := clients.CreateAdmClient(s.deploymentRESTServerUrl, s.token, "invalidprojectid")
 	s.NoError(err)
 
@@ -28,7 +28,7 @@ func (s *TestSuite) TestListDeploymentsInvalidProjectID() {
 
 // TestGetDeploymentInvalidProjectID tests the get deployment method with invalid project ID
 func (s *TestSuite) TestGetDeploymentInvalidProjectID() {
-	s.T().Parallel()
+	// s.T().Parallel() // Disabled to run tests sequentially
 	deploymentReq := deploymentutils.StartDeploymentRequest{
 		AdmClient:         s.AdmClient,
 		DpPackageName:     deploymentutils.AppNginx,
@@ -59,7 +59,7 @@ func (s *TestSuite) TestGetDeploymentInvalidProjectID() {
 	s.NoError(err)
 }
 func (s *TestSuite) TestDeleteDeploymentInvalidProjectID() {
-	s.T().Parallel()
+	// s.T().Parallel() // Disabled to run tests sequentially
 	// Create a deployment to be deleted
 	deploymentReq := deploymentutils.StartDeploymentRequest{
 		AdmClient:         s.AdmClient,