Skip to content

OSAC-1733: Scope component build context to its own subdirectory #284

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
eliorerz merged 1 commit into from
Jul 31, 2026
Merged

OSAC-1733: Scope component build context to its own subdirectory #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 19 additions & 6 deletions .github/workflows/e2e-bmaas-full-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,30 +360,43 @@ jobs:
echo "::group::Build component[$i]: ${repo}@${ref} (${file})"
git clone --depth 1 --branch "${ref}" "https://github.com/${repo}.git" "${src}"

# When `file` has a directory component (e.g.
# "fulfillment-service/Containerfile" from a monorepo checkout),
# everything about this component -- build context, go.mod,
# cmd/, CRDs -- lives under that subdirectory, not at the
# checkout root. Mirrors the same scoping in
# replace-installer-submodule.sh.
build_dir="${src}"
containerfile_name="${file}"
if [[ "${file}" == */* ]]; then
build_dir="${src}/$(dirname "${file}")"
containerfile_name="$(basename "${file}")"
fi

if [[ "${build_type}" == "ansible-builder" ]]; then
python3 -m pip install --quiet 'ansible-builder~=3.0'
ansible-builder create --file "${src}/${file}" --context "${src}/context"
podman build -t "${tag}" -f "${src}/context/Containerfile" "${src}/context"
ansible-builder create --file "${build_dir}/${containerfile_name}" --context "${build_dir}/context"
podman build -t "${tag}" -f "${build_dir}/context/Containerfile" "${build_dir}/context"
else
podman build -t "${tag}" -f "${src}/${file}" "${src}"
podman build -t "${tag}" -f "${build_dir}/${containerfile_name}" "${build_dir}"
fi

# Build OSAC CLI from source when this component is fulfillment-service.
# Keyed off imageKey (not a repo-name substring), so this works whether
# repo is fulfillment-service's own repo or a monorepo like osac-project/osac.
if [[ "${image_key}" == "service.images.service" ]]; then
(cd "${src}" && CGO_ENABLED=0 go build -o "$RUNNER_TEMP/osac-cli-bin" ./cmd/osac)
(cd "${build_dir}" && CGO_ENABLED=0 go build -o "$RUNNER_TEMP/osac-cli-bin" ./cmd/osac)
echo "OSAC_CLI_BIN=$RUNNER_TEMP/osac-cli-bin" >> "$GITHUB_ENV"
fi

# Save CRDs from the component source so they can be applied after
# OSAC install. Without this, CRDs come from osac-installer's
# submodule pin and miss any CRD changes in the PR.
crds_dir=""
if [[ -d "${src}/config/crd/bases" ]]; then
if [[ -d "${build_dir}/config/crd/bases" ]]; then
crds_dir="$RUNNER_TEMP/component-${i}-crds"
mkdir -p "${crds_dir}"
cp "${src}"/config/crd/bases/*.yaml "${crds_dir}/"
cp "${build_dir}"/config/crd/bases/*.yaml "${crds_dir}/"
fi

echo "Loading image onto node ${NODE_NAME}..."
Expand Down
20 changes: 16 additions & 4 deletions .github/workflows/e2e-caas-full-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,19 +364,31 @@ jobs:
echo "::group::Build component[$i]: ${repo}@${ref} (${file})"
git clone --depth 1 --branch "${ref}" "https://github.com/${repo}.git" "${src}"

# When `file` has a directory component (e.g.
# "fulfillment-service/Containerfile" from a monorepo checkout),
# everything about this component -- build context, go.mod,
# cmd/ -- lives under that subdirectory, not at the checkout
# root. Mirrors the same scoping in replace-installer-submodule.sh.
build_dir="${src}"
containerfile_name="${file}"
if [[ "${file}" == */* ]]; then
build_dir="${src}/$(dirname "${file}")"
containerfile_name="$(basename "${file}")"
fi

if [[ "${build_type}" == "ansible-builder" ]]; then
python3 -m pip install --quiet 'ansible-builder~=3.0'
ansible-builder create --file "${src}/${file}" --context "${src}/context"
podman build -t "${tag}" -f "${src}/context/Containerfile" "${src}/context"
ansible-builder create --file "${build_dir}/${containerfile_name}" --context "${build_dir}/context"
podman build -t "${tag}" -f "${build_dir}/context/Containerfile" "${build_dir}/context"
else
podman build -t "${tag}" -f "${src}/${file}" "${src}"
podman build -t "${tag}" -f "${build_dir}/${containerfile_name}" "${build_dir}"
fi

# Build OSAC CLI from source when this component is fulfillment-service.
# Keyed off imageKey (not a repo-name substring), so this works whether
# repo is fulfillment-service's own repo or a monorepo like osac-project/osac.
if [[ "${image_key}" == "service.images.service" ]]; then
(cd "${src}" && CGO_ENABLED=0 go build -o "$RUNNER_TEMP/osac-cli-bin" ./cmd/osac)
(cd "${build_dir}" && CGO_ENABLED=0 go build -o "$RUNNER_TEMP/osac-cli-bin" ./cmd/osac)
echo "OSAC_CLI_BIN=$RUNNER_TEMP/osac-cli-bin" >> "$GITHUB_ENV"
fi

Expand Down
25 changes: 19 additions & 6 deletions .github/workflows/e2e-vmaas-full-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,30 +378,43 @@ jobs:
echo "::group::Build component[$i]: ${repo}@${ref} (${file})"
git clone --depth 1 --branch "${ref}" "https://github.com/${repo}.git" "${src}"

# When `file` has a directory component (e.g.
# "fulfillment-service/Containerfile" from a monorepo checkout),
# everything about this component -- build context, go.mod,
# cmd/, CRDs -- lives under that subdirectory, not at the
# checkout root. Mirrors the same scoping in
# replace-installer-submodule.sh.
build_dir="${src}"
containerfile_name="${file}"
if [[ "${file}" == */* ]]; then
build_dir="${src}/$(dirname "${file}")"
containerfile_name="$(basename "${file}")"
fi

if [[ "${build_type}" == "ansible-builder" ]]; then
python3 -m pip install --quiet 'ansible-builder~=3.0'
ansible-builder create --file "${src}/${file}" --context "${src}/context"
podman build -t "${tag}" -f "${src}/context/Containerfile" "${src}/context"
ansible-builder create --file "${build_dir}/${containerfile_name}" --context "${build_dir}/context"
podman build -t "${tag}" -f "${build_dir}/context/Containerfile" "${build_dir}/context"
else
podman build -t "${tag}" -f "${src}/${file}" "${src}"
podman build -t "${tag}" -f "${build_dir}/${containerfile_name}" "${build_dir}"
fi

# Build OSAC CLI from source when this component is fulfillment-service.
# Keyed off imageKey (not a repo-name substring), so this works whether
# repo is fulfillment-service's own repo or a monorepo like osac-project/osac.
if [[ "${image_key}" == "service.images.service" ]]; then
(cd "${src}" && CGO_ENABLED=0 go build -o "$RUNNER_TEMP/osac-cli-bin" ./cmd/osac)
(cd "${build_dir}" && CGO_ENABLED=0 go build -o "$RUNNER_TEMP/osac-cli-bin" ./cmd/osac)
echo "OSAC_CLI_BIN=$RUNNER_TEMP/osac-cli-bin" >> "$GITHUB_ENV"
fi

# Save CRDs from the component source so they can be applied after
# OSAC install. Without this, CRDs come from osac-installer's
# submodule pin and miss any CRD changes in the PR.
crds_dir=""
if [[ -d "${src}/config/crd/bases" ]]; then
if [[ -d "${build_dir}/config/crd/bases" ]]; then
crds_dir="$RUNNER_TEMP/component-${i}-crds"
mkdir -p "${crds_dir}"
cp "${src}"/config/crd/bases/*.yaml "${crds_dir}/"
cp "${build_dir}"/config/crd/bases/*.yaml "${crds_dir}/"
fi

echo "Loading image onto node ${NODE_NAME}..."
Expand Down
Loading