Skip to content

Specify registry for nginx (#2321) #2337

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 1 commit into
base: release-3.21
Choose a base branch
from
Open

Specify registry for nginx (#2321) #2337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion integration-tests/container/QA_TAG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.1
2.0.3
1 change: 1 addition & 0 deletions integration-tests/container/nginx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM nginx:1.14-alpine
23 changes: 23 additions & 0 deletions integration-tests/container/nginx/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) .
2 changes: 1 addition & 1 deletion integration-tests/images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 4 additions & 1 deletion integration-tests/suites/async_connections.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
6 changes: 3 additions & 3 deletions integration-tests/suites/process_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 5 additions & 2 deletions integration-tests/suites/procfs_scraper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 6 additions & 3 deletions integration-tests/suites/repeated_network_flow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Loading