Skip to content
Merged
Changes from all commits
Commits
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
15 changes: 12 additions & 3 deletions tests/ci/docker_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,9 @@ def build_and_push_image(
init_args = ["docker", "buildx", "build"]
if push:
init_args.append("--push")
init_args.append("--output=type=image,push-by-digest=true")
# NOTE(vnemkov): since for FIPS we don't build arm64 images and don't merge that against amd64 images,
# we don't need to do `push-by-digest`.
init_args.append("--output=type=image")
init_args.append(f"--tag={image.repo}")
else:
init_args.append("--output=type=docker")
Expand Down Expand Up @@ -365,12 +367,19 @@ def main():
del args.image_repo
del args.push

if pr_info.is_master():
push = True
# if pr_info.is_master():
# push = True
# NOTE(vnemkov): always push (since we are pushing to a intermediary repo) for testing
push = True

image = DockerImageData(image_path, image_repo, False)
args.release_type = auto_release_type(args.version, args.release_type)
tags = gen_tags(args.version, args.release_type)

# NOTE(vnemkov): publish docker images created by PRs, so there is a way to test them
if pr_info.is_pr():
tags.append(f'PR-{pr_info.number}-{pr_info.sha}')

repo_urls = {}
direct_urls: Dict[str, List[str]] = {}
release_or_pr, _ = get_release_or_pr(pr_info, args.version)
Expand Down