Skip to content

Commit a5df47c

Browse files
lpramukrmynar
authored andcommitted
Replace library/busybox with lighter container repo (SatelliteQE#20671)
1 parent 86dc9f3 commit a5df47c

3 files changed

Lines changed: 12 additions & 9 deletions

File tree

conf/container.yaml.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CONTAINER:
44
- docker
55
- podman
66
REGISTRY_HUB: https://mirror.gcr.io
7-
UPSTREAM_NAME: 'library/busybox'
7+
UPSTREAM_NAME: jmalloc/echo-server
88
ALTERNATIVE_UPSTREAM_NAMES:
99
- hello-world
1010
- alpine

robottelo/config/validators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
'container.upstream_name',
120120
must_exist=True,
121121
is_type_of=str,
122-
default='library/busybox',
122+
default='jmalloc/echo-server',
123123
),
124124
Validator(
125125
'container.alternative_upstream_names',

tests/foreman/cli/test_container_management.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"""
1212

1313
from datetime import UTC, datetime
14+
import re
1415

1516
from box import Box
1617
from fauxfactory import gen_string
@@ -94,16 +95,18 @@ def test_positive_pull_image(
9495
)
9596
assert result.status == 0
9697
try:
97-
result = module_container_contenthost.execute(f'docker run {repo["published-at"]}')
98+
result = module_container_contenthost.execute(
99+
f'docker run -d {repo["published-at"]}'
100+
)
98101
assert result.status == 0
102+
match = re.match(r'^[0-9a-f]+$', result.stdout)
103+
if match:
104+
container_id = match.group(0)
99105
finally:
100106
# Stop and remove the container
101-
result = module_container_contenthost.execute(
102-
f'docker ps -a | grep {repo["published-at"]}'
103-
)
104-
container_id = result.stdout[0].split()[0]
105-
module_container_contenthost.execute(f'docker stop {container_id}')
106-
module_container_contenthost.execute(f'docker rm {container_id}')
107+
if container_id:
108+
module_container_contenthost.execute(f'docker stop {container_id}')
109+
module_container_contenthost.execute(f'docker rm {container_id}')
107110
finally:
108111
# Remove docker image
109112
module_container_contenthost.execute(f'docker rmi {repo["published-at"]}')

0 commit comments

Comments
 (0)