Skip to content

Commit b7e583c

Browse files
committed
Replace library/busybox with lighter container repo (SatelliteQE#20671)
(cherry picked from commit 8ac73bc)
1 parent 38509dc commit b7e583c

3 files changed

Lines changed: 13 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: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
1111
"""
1212

13+
import re
14+
1315
from fauxfactory import gen_string
1416
import pytest
1517
from wait_for import wait_for
@@ -92,16 +94,18 @@ def test_positive_pull_image(
9294
)
9395
assert result.status == 0
9496
try:
95-
result = module_container_contenthost.execute(f'docker run {repo["published-at"]}')
97+
result = module_container_contenthost.execute(
98+
f'docker run -d {repo["published-at"]}'
99+
)
96100
assert result.status == 0
101+
match = re.match(r'^[0-9a-f]+$', result.stdout)
102+
if match:
103+
container_id = match.group(0)
97104
finally:
98105
# Stop and remove the container
99-
result = module_container_contenthost.execute(
100-
f'docker ps -a | grep {repo["published-at"]}'
101-
)
102-
container_id = result.stdout[0].split()[0]
103-
module_container_contenthost.execute(f'docker stop {container_id}')
104-
module_container_contenthost.execute(f'docker rm {container_id}')
106+
if container_id:
107+
module_container_contenthost.execute(f'docker stop {container_id}')
108+
module_container_contenthost.execute(f'docker rm {container_id}')
105109
finally:
106110
# Remove docker image
107111
module_container_contenthost.execute(f'docker rmi {repo["published-at"]}')

0 commit comments

Comments
 (0)