Cleanup integration tests (#1066)

Co-authored-by: Aphral Griffin <a.griffin@f5.com>

Author: NutsaB

Makefile

@@ -159,13 +159,13 @@ integration-test: $(SELECTED_PACKAGE) build-mock-management-plane-grpc
 	TEST_ENV="Container" CONTAINER_OS_TYPE=$(CONTAINER_OS_TYPE) BUILD_TARGET="install-agent-local" CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} \
 	PACKAGES_REPO=$(OSS_PACKAGES_REPO) PACKAGE_NAME=$(PACKAGE_NAME) BASE_IMAGE=$(BASE_IMAGE) DOCKERFILE_PATH=$(DOCKERFILE_PATH) IMAGE_PATH=$(IMAGE_PATH) TAG=${IMAGE_TAG} \
 	OS_VERSION=$(OS_VERSION) OS_RELEASE=$(OS_RELEASE) \
-	go test -v ./test/integration
+	go test -v ./test/integration/installuninstall ./test/integration/managementplane ./test/integration/nginxless
 
 official-image-integration-test: $(SELECTED_PACKAGE) build-mock-management-plane-grpc
 	TEST_ENV="Container" CONTAINER_OS_TYPE=$(CONTAINER_OS_TYPE) CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} BUILD_TARGET="install" \
 	PACKAGES_REPO=$(OSS_PACKAGES_REPO) TAG=${TAG} PACKAGE_NAME=$(PACKAGE_NAME) BASE_IMAGE=$(BASE_IMAGE) DOCKERFILE_PATH=$(OFFICIAL_IMAGE_DOCKERFILE_PATH) \
 	OS_VERSION=$(OS_VERSION) OS_RELEASE=$(OS_RELEASE) IMAGE_PATH=$(IMAGE_PATH) \
-	go test -v ./test/integration/grpc_management_plane_api_test.go
+	go test -v ./test/integration/managementplane
 
 performance-test:
 	@mkdir -p $(TEST_BUILD_DIR)

test/helpers/test_containers_utils.go

@@ -46,7 +46,7 @@ func StartContainer(
 
 	req := testcontainers.ContainerRequest{
 		FromDockerfile: testcontainers.FromDockerfile{
-			Context:       "../../",
+			Context:       "../../../",
 			Dockerfile:    dockerfilePath,
 			KeepImage:     false,
 			PrintBuildLog: true,
@@ -118,7 +118,7 @@ func StartAgentlessContainer(
 
 	req := testcontainers.ContainerRequest{
 		FromDockerfile: testcontainers.FromDockerfile{
-			Context:       "../../",
+			Context:       "../../../",
 			Dockerfile:    dockerfilePath,
 			KeepImage:     false,
 			PrintBuildLog: true,
@@ -179,7 +179,7 @@ func StartNginxLessContainer(
 
 	req := testcontainers.ContainerRequest{
 		FromDockerfile: testcontainers.FromDockerfile{
-			Context:       "../../",
+			Context:       "../../../",
 			Dockerfile:    dockerfilePath,
 			KeepImage:     false,
 			PrintBuildLog: true,
@@ -236,7 +236,7 @@ func StartMockManagementPlaneGrpcContainer(
 
 	req := testcontainers.ContainerRequest{
 		FromDockerfile: testcontainers.FromDockerfile{
-			Context:       "../../",
+			Context:       "../../../",
 			Dockerfile:    "./test/mock/grpc/Dockerfile",
 			KeepImage:     false,
 			PrintBuildLog: true,