diff --git a/test/scripts/generate-ostree-build-config b/test/scripts/generate-ostree-build-config index d9f2ba8c65..0cc927eefc 100755 --- a/test/scripts/generate-ostree-build-config +++ b/test/scripts/generate-ostree-build-config @@ -15,7 +15,9 @@ build/{distro}/{arch}/{image_type}/{config_name}: osbuild osbuild-luks2 osbuild-lvm2 osbuild-ostree osbuild-selinux s3cmd podman xz - {start_container} - - ./test/scripts/build-image.sh "{distro}" "{image_type}" "{config}" + - ./test/scripts/build-image "{distro}" "{image_type}" "{config}" + - ./test/scripts/boot-image "{distro}" "{arch}" "{image_type}" "{image_path}" + - ./test/scripts/upload-results "{distro}" "{image_type}" "{config}" extends: .terraform variables: RUNNER: aws/fedora-38-{arch} @@ -281,6 +283,8 @@ def generate_configs(build_requests, pull_configs, container_configs, pipeline_f config_name = config["name"] + build_name = testlib.gen_build_name(distro, arch, image_type, config_name) + image_path = f"./build/{build_name}" # generate script line to pull and start container container = container_configs[config_name] @@ -296,7 +300,8 @@ def generate_configs(build_requests, pull_configs, container_configs, pipeline_f pipeline_file.write(JOB_TEMPLATE.format(distro=distro, arch=arch, image_type=image_type, config_name=config_name, config=build_config_path, start_container=container_cmd, - internal="true" if "rhel" in distro else "false")) + internal="true" if "rhel" in distro else "false", + image_path=image_path)) print("✅ DONE!")