From 6a33643afd70a1c2ed5e83711cbad9947c1d6abe Mon Sep 17 00:00:00 2001 From: Dmitrii Dolgov <9erthalion6@gmail.com> Date: Thu, 7 Aug 2025 16:52:47 +0200 Subject: [PATCH] Specify registry for nginx (#2321) Currently no registry is set for nginx, with leads to a few issues: * It's being pulled from docker.io and sometimes bails out due to rate limiting. * With podman it can cause an issue with short-name resolution: ``` short-name resolution enforced but cannot prompt without a TTY ``` Promote nginx from a non_qa to qa image. --- integration-tests/container/QA_TAG | 2 +- integration-tests/container/nginx/Dockerfile | 1 + integration-tests/container/nginx/Makefile | 23 +++++++++++++++++++ integration-tests/images.yml | 2 +- integration-tests/suites/async_connections.go | 5 +++- integration-tests/suites/process_network.go | 6 ++--- integration-tests/suites/procfs_scraper.go | 7 ++++-- .../suites/repeated_network_flow.go | 9 +++++--- 8 files changed, 44 insertions(+), 11 deletions(-) create mode 100644 integration-tests/container/nginx/Dockerfile create mode 100644 integration-tests/container/nginx/Makefile diff --git a/integration-tests/container/QA_TAG b/integration-tests/container/QA_TAG index 38f77a65b3..50ffc5aa7f 100644 --- a/integration-tests/container/QA_TAG +++ b/integration-tests/container/QA_TAG @@ -1 +1 @@ -2.0.1 +2.0.3 diff --git a/integration-tests/container/nginx/Dockerfile b/integration-tests/container/nginx/Dockerfile new file mode 100644 index 0000000000..9bac349335 --- /dev/null +++ b/integration-tests/container/nginx/Dockerfile @@ -0,0 +1 @@ +FROM nginx:1.14-alpine diff --git a/integration-tests/container/nginx/Makefile b/integration-tests/container/nginx/Makefile new file mode 100644 index 0000000000..9ab0be50c1 --- /dev/null +++ b/integration-tests/container/nginx/Makefile @@ -0,0 +1,23 @@ +BASE_PATH = . +include ../Makefile-constants.mk + +DEFAULT_GOAL = all + +COLLECTOR_QA_NGINX_TAG := nginx + +ifneq ($(COLLECTOR_QA_TAG),) +COLLECTOR_QA_NGINX_TAG=nginx-$(COLLECTOR_QA_TAG) +endif + +.PHONY: all +all: build + +.PHONY: build +build: + @docker buildx build --load --platform ${PLATFORM} \ + -t quay.io/rhacs-eng/qa-multi-arch:$(COLLECTOR_QA_NGINX_TAG) . + +.PHONY: build-and-push +build-and-push: + @docker buildx build --push --platform ${PLATFORM} \ + -t quay.io/rhacs-eng/qa-multi-arch:$(COLLECTOR_QA_NGINX_TAG) . diff --git a/integration-tests/images.yml b/integration-tests/images.yml index f753604453..505de8d2e5 100644 --- a/integration-tests/images.yml +++ b/integration-tests/images.yml @@ -15,6 +15,6 @@ qa: qa-perf-event-open: quay.io/rhacs-eng/qa-multi-arch:collector-perf-event-open qa-udp: quay.io/rhacs-eng/qa-multi-arch:udp qa-thread-exec: quay.io/rhacs-eng/qa-multi-arch:collector-thread-exec + qa-nginx: quay.io/rhacs-eng/qa-multi-arch:nginx non_qa: - nginx: nginx:1.14-alpine diff --git a/integration-tests/suites/async_connections.go b/integration-tests/suites/async_connections.go index 26032b4445..8e7082474d 100644 --- a/integration-tests/suites/async_connections.go +++ b/integration-tests/suites/async_connections.go @@ -51,7 +51,10 @@ func (s *AsyncConnectionTestSuite) SetupSuite() { image_store := config.Images() - containerID, err := s.Executor().StartContainer(config.ContainerStartConfig{Name: "server", Image: image_store.ImageByKey("nginx")}) + containerID, err := s.Executor().StartContainer(config.ContainerStartConfig{ + Name: "server", + Image: image_store.QaImageByKey("qa-nginx"), + }) s.Require().NoError(err) s.serverContainer = common.ContainerShortID(containerID) diff --git a/integration-tests/suites/process_network.go b/integration-tests/suites/process_network.go index 68d0669fcb..7ef61ca66a 100644 --- a/integration-tests/suites/process_network.go +++ b/integration-tests/suites/process_network.go @@ -30,12 +30,12 @@ func (s *ProcessNetworkTestSuite) SetupSuite() { image_store := config.Images() images := []string{ - image_store.ImageByKey("nginx"), + image_store.QaImageByKey("qa-nginx"), image_store.QaImageByKey("qa-alpine-curl"), } for _, image := range images { - err := s.executor.PullImage(image) + err := s.Executor().PullImage(image) s.Require().NoError(err) } @@ -43,7 +43,7 @@ func (s *ProcessNetworkTestSuite) SetupSuite() { containerID, err := s.Executor().StartContainer( config.ContainerStartConfig{ Name: "nginx", - Image: image_store.ImageByKey("nginx"), + Image: image_store.QaImageByKey("qa-nginx"), }) s.Require().NoError(err) diff --git a/integration-tests/suites/procfs_scraper.go b/integration-tests/suites/procfs_scraper.go index d2f13e3856..9f71afa201 100644 --- a/integration-tests/suites/procfs_scraper.go +++ b/integration-tests/suites/procfs_scraper.go @@ -46,13 +46,16 @@ func (s *ProcfsScraperTestSuite) SetupSuite() { } func (s *ProcfsScraperTestSuite) launchNginx() { - image := config.Images().ImageByKey("nginx") + image := config.Images().QaImageByKey("qa-nginx") err := s.executor.PullImage(image) s.Require().NoError(err) // invokes default nginx - containerID, err := s.Executor().StartContainer(config.ContainerStartConfig{Name: "nginx", Image: image}) + containerID, err := s.Executor().StartContainer(config.ContainerStartConfig{ + Name: "nginx", + Image: image, + }) s.Require().NoError(err) s.ServerContainer = common.ContainerShortID(containerID) diff --git a/integration-tests/suites/repeated_network_flow.go b/integration-tests/suites/repeated_network_flow.go index 3b8b19de16..fa9d442ae3 100644 --- a/integration-tests/suites/repeated_network_flow.go +++ b/integration-tests/suites/repeated_network_flow.go @@ -57,17 +57,20 @@ func (s *RepeatedNetworkFlowTestSuite) SetupSuite() { scheduled_curls_image := image_store.QaImageByKey("qa-schedule-curls") images := []string{ - image_store.ImageByKey("nginx"), + image_store.QaImageByKey("qa-nginx"), scheduled_curls_image, } for _, image := range images { - err := s.executor.PullImage(image) + err := s.Executor().PullImage(image) s.Require().NoError(err) } // invokes default nginx - containerID, err := s.Executor().StartContainer(config.ContainerStartConfig{Name: "nginx", Image: image_store.ImageByKey("nginx")}) + containerID, err := s.Executor().StartContainer(config.ContainerStartConfig{ + Name: "nginx", + Image: image_store.QaImageByKey("qa-nginx"), + }) s.Require().NoError(err) s.ServerContainer = containerID[0:12]