Skip to content

Cleanup integration tests #1066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: v3
Choose a base branch
from
Open

Cleanup integration tests #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
093adc3
Create new files and split integration tests
NutsaB Apr 23, 2025
868775b
Rename test files and Move helper functions
NutsaB Apr 24, 2025
0440b65
Merge remote-tracking branch 'origin/v3' into cleanup-integration-tests
NutsaB Apr 25, 2025
6d1f4dd
Move configApplyErrorMessage
NutsaB Apr 25, 2025
81ca8f5
Merge remote-tracking branch 'origin/v3' into cleanup-integration-tests
NutsaB Apr 28, 2025
d7d0a98
fix mnd errors
NutsaB Apr 28, 2025
b305d73
fix integration tests
NutsaB Apr 28, 2025
5c60866
Create additional packages for integration tests
NutsaB Apr 28, 2025
e0a2214
Update Makefile with new test dir
NutsaB Apr 28, 2025
0257ee9
Update dockerfile paths & Makefile
NutsaB Apr 29, 2025
29166d2
fix config apply paths
NutsaB Apr 30, 2025
916c7f1
Merge v3 into branch
NutsaB Apr 30, 2025
9e3c964
Fix merge conflicts
NutsaB Apr 30, 2025
166320f
Fix failed test
NutsaB May 1, 2025
852e6aa
fix wrong path
NutsaB May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,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)
Expand Down
8 changes: 4 additions & 4 deletions test/helpers/test_containers_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func StartContainer(

req := testcontainers.ContainerRequest{
FromDockerfile: testcontainers.FromDockerfile{
Context: "../../",
Context: "../../../",
Dockerfile: dockerfilePath,
KeepImage: false,
PrintBuildLog: true,
Expand Down Expand Up @@ -118,7 +118,7 @@ func StartAgentlessContainer(

req := testcontainers.ContainerRequest{
FromDockerfile: testcontainers.FromDockerfile{
Context: "../../",
Context: "../../../",
Dockerfile: dockerfilePath,
KeepImage: false,
PrintBuildLog: true,
Expand Down Expand Up @@ -179,7 +179,7 @@ func StartNginxLessContainer(

req := testcontainers.ContainerRequest{
FromDockerfile: testcontainers.FromDockerfile{
Context: "../../",
Context: "../../../",
Dockerfile: dockerfilePath,
KeepImage: false,
PrintBuildLog: true,
Expand Down Expand Up @@ -236,7 +236,7 @@ func StartMockManagementPlaneGrpcContainer(

req := testcontainers.ContainerRequest{
FromDockerfile: testcontainers.FromDockerfile{
Context: "../../",
Context: "../../../",
Dockerfile: "./test/mock/grpc/Dockerfile",
KeepImage: false,
PrintBuildLog: true,
Expand Down
Loading
Loading