Specify registry for nginx (#2321)

integration-tests/container/QA_TAG

@@ -1 +1 @@
-2.0.0
+2.0.3

integration-tests/container/nginx/Dockerfile

@@ -0,0 +1 @@
+FROM nginx:1.14-alpine

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) .

integration-tests/images.yml

@@ -14,6 +14,6 @@ qa:
   qa-alpine-curl: quay.io/rhacs-eng/qa-multi-arch:alpine-curl
   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-nginx: quay.io/rhacs-eng/qa-multi-arch:nginx
 
 non_qa:
-  nginx: nginx:1.14-alpine

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)
 

integration-tests/suites/process_network.go

@@ -30,20 +30,20 @@ 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)
 	}
 
 	// invokes default nginx
 	containerID, err := s.Executor().StartContainer(
 		config.ContainerStartConfig{
 			Name:  "nginx",
-			Image: image_store.ImageByKey("nginx"),
+			Image: image_store.QaImageByKey("qa-nginx"),
 		})
 
 	s.Require().NoError(err)

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)

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]