66b96ac3a5
This commit updates all GitHub Actions workflows and the Makefile to ensure
consistent behavior across unit, integration, end-to-end, and OS-container
tests.
Changes include:
CI Workflows:
- Rename workflows for clearer, more professional naming:
* "Test Distribution Containers" → "Test OS Containers"
* "Test package-manager (e2e)" → "Test End-To-End"
* "Test package-manager (unit)" → "Test Units"
* "Test package-manager (integration)" → "Test Code Integration"
- Remove explicit build steps from workflows; container creation is now
delegated to the Makefile via build-missing.
- Restrict test jobs to only build the Arch test container by setting:
DISTROS="arch"
Makefile:
- Add build-missing as a dependency to all test targets:
test-unit, test-integration, test-e2e, test-container
- Remove redundant build-missing call from the combined 'test' target,
since Make now ensures build-missing runs exactly once per invocation.
- Preserve existing target structure while ensuring container images are
built automatically on demand.
This makes the CI pipeline faster, more predictable, and removes duplicated
container build logic. All tests now use the same unified mechanism for
building missing images.
82 lines
2.8 KiB
Makefile
82 lines
2.8 KiB
Makefile
.PHONY: install setup uninstall \
|
|
test build build-no-cache test-unit test-e2e test-integration \
|
|
test-container
|
|
|
|
# ------------------------------------------------------------
|
|
# Local Nix cache directories in the repo
|
|
# ------------------------------------------------------------
|
|
NIX_STORE_VOLUME := pkgmgr_nix_store
|
|
NIX_CACHE_VOLUME := pkgmgr_nix_cache
|
|
|
|
# ------------------------------------------------------------
|
|
# Distro list and base images
|
|
# (kept for documentation/reference; actual build logic is in scripts/build)
|
|
# ------------------------------------------------------------
|
|
DISTROS := arch debian ubuntu fedora centos
|
|
BASE_IMAGE_ARCH := archlinux:latest
|
|
BASE_IMAGE_DEBIAN := debian:stable-slim
|
|
BASE_IMAGE_UBUNTU := ubuntu:latest
|
|
BASE_IMAGE_FEDORA := fedora:latest
|
|
BASE_IMAGE_CENTOS := quay.io/centos/centos:stream9
|
|
|
|
# Make them available in scripts
|
|
export DISTROS
|
|
export BASE_IMAGE_ARCH
|
|
export BASE_IMAGE_DEBIAN
|
|
export BASE_IMAGE_UBUNTU
|
|
export BASE_IMAGE_FEDORA
|
|
export BASE_IMAGE_CENTOS
|
|
|
|
# ------------------------------------------------------------
|
|
# PKGMGR setup (developer wrapper -> scripts/installation/main.sh)
|
|
# ------------------------------------------------------------
|
|
setup:
|
|
@bash scripts/installation/main.sh
|
|
|
|
# ------------------------------------------------------------
|
|
# Docker build targets (delegated to scripts/build)
|
|
# ------------------------------------------------------------
|
|
build-no-cache:
|
|
@bash scripts/build/build-image-no-cache.sh
|
|
|
|
build:
|
|
@bash scripts/build/build-image.sh
|
|
|
|
# ------------------------------------------------------------
|
|
# Test targets (delegated to scripts/test)
|
|
# ------------------------------------------------------------
|
|
|
|
test-unit: build-missing
|
|
@bash scripts/test/test-unit.sh
|
|
|
|
test-integration: build-missing
|
|
@bash scripts/test/test-integration.sh
|
|
|
|
test-e2e: build-missing
|
|
@bash scripts/test/test-e2e.sh
|
|
|
|
test-container: build-missing
|
|
@bash scripts/test/test-container.sh
|
|
|
|
# ------------------------------------------------------------
|
|
# Build only missing container images
|
|
# ------------------------------------------------------------
|
|
build-missing:
|
|
@bash scripts/build/build-image-missing.sh
|
|
|
|
# Combined test target for local + CI (unit + e2e + integration)
|
|
test: test-container test-unit test-e2e test-integration
|
|
|
|
# ------------------------------------------------------------
|
|
# System install (native packages, calls scripts/installation/run-package.sh)
|
|
# ------------------------------------------------------------
|
|
install:
|
|
@echo "Building and installing distro-native package-manager for this system..."
|
|
@bash scripts/installation/run-package.sh
|
|
|
|
# ------------------------------------------------------------
|
|
# Uninstall target
|
|
# ------------------------------------------------------------
|
|
uninstall:
|
|
@bash scripts/uninstall.sh
|