Skip to content

Some adjustments to use behave tests with Podman #62

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

Merged
jmtd merged 3 commits into from
May 29, 2025
Merged

Some adjustments to use behave tests with Podman #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fd987b
configurable docker API socket via DOCKER_HOST
jmtd Mar 22, 2024
36f8f8b
Reformat s2i command string for clarity
jmtd Nov 11, 2024
ac4b3a2
use docker.constants.DEFAULT_UNIX_SOCKET
jmtd May 28, 2025
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
3 changes: 2 additions & 1 deletion steps/container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
# A future version of Cekit will expose this to us, for now we hard-code
DOCKER_API_VERSION = "1.35"

d = docker.APIClient(version=DOCKER_API_VERSION)
base_url = os.environ.get("DOCKER_HOST", docker.constants.DEFAULT_UNIX_SOCKET)
d = docker.APIClient(version=DOCKER_API_VERSION, base_url=base_url)


class ExecException(Exception):
Expand Down
4 changes: 3 additions & 1 deletion steps/image_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import os
import docker


Expand All @@ -6,7 +7,8 @@
# A future version of Cekit will expose this to us, for now we hard-code
DOCKER_API_VERSION = "1.35"

DOCKER_CLIENT = docker.APIClient(version=DOCKER_API_VERSION)
base_url = os.environ.get("DOCKER_HOST", docker.constants.DEFAULT_UNIX_SOCKET)
DOCKER_CLIENT = docker.APIClient(version=DOCKER_API_VERSION, base_url=base_url)

@then(u'the image should contain label {label}')
@then(u'the image should contain label {label} {check} value {value}')
Expand Down
17 changes: 13 additions & 4 deletions steps/s2i_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,19 @@ def s2i_inner(context, application, path='.', env="", incremental=False, tag="ma
mirror = "-e 'MAVEN_MIRROR_URL=%s'" % os.getenv("MAVEN_MIRROR_URL")

image_id = "integ-" + context.image
command = "s2i build --loglevel=5 --pull-policy if-not-present %s --context-dir=%s -r=%s %s %s %s %s %s %s" % (
mirror, path, tag, env, application, context.image, image_id, "--incremental" if incremental else "",
"--runtime-image="+runtime_image if runtime_image else ""
)

command = f"""s2i build --loglevel=5 --pull-policy if-not-present\
{mirror}\
--context-dir={path}\
-r={tag}\
{env}\
{application}\
{context.image}\
{image_id}\
{"--incremental" if incremental else ""}\
{"--runtime-image="+runtime_image if runtime_image else ""}\
"""

logger.info("Executing new S2I build with the command [%s]..." % command)

success, output = _execute(command)
Expand Down