Skip to content

gha: run rootless and rootful integration in parallel #633

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
cyphar merged 4 commits into from
Oct 3, 2025
+26 −4
Merged

gha: run rootless and rootful integration in parallel #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3f2eda
gha: add 'complete' job
cyphar Oct 3, 2025
94a7c04
gha: run rootless and rootful integration in parallel
cyphar Oct 3, 2025
b7bb5d2
gha: use mode=min caching
cyphar Oct 3, 2025
a058839
gha: reduce ClusterFuzzLite time limit
cyphar Oct 3, 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
2 changes: 1 addition & 1 deletion .github/workflows/cflite-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
uses: google/clusterfuzzlite/actions/run_fuzzers@v1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
fuzz-seconds: 600
fuzz-seconds: 300
mode: 'code-change'
sanitizer: ${{ matrix.sanitizer }}
output-sarif: true
Expand Down
17 changes: 16 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ jobs:
- debian:latest
- ubuntu:latest
- fedora:latest
test:
- root
- rootless
env:
TEST_DOCKER_IMAGE: ${{ matrix.image }}
COVERAGE: umoci.coverage
Expand All @@ -165,7 +168,7 @@ jobs:
${{ github.workflow }}-image-
- name: load ci image
run: make ci-cache
- run: make TEST_DOCKER_IMAGE=$TEST_DOCKER_IMAGE test-integration
- run: make TEST_DOCKER_IMAGE=$TEST_DOCKER_IMAGE test-${{ matrix.test }}-integration
- run: go tool covdata textfmt -i "$GOCOVERDIR" -o "$COVERAGE"
- name: codecov
uses: codecov/codecov-action@v5
Expand Down Expand Up @@ -202,3 +205,15 @@ jobs:
with:
name: coverage
path: ${{ env.GOCOVERDIR }}

complete:
runs-on: ubuntu-latest
needs:
- release
- validate
- macos
- unit
- integration
- coverage
steps:
- run: echo "all done"
11 changes: 9 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,16 @@ local-test-unit:
TESTS ?=

.PHONY: test-integration
test-integration: ci-image
test-integration: test-root-integration test-rootless-integration

.PHONY: test-root-integration
test-root-integration: ci-image umoci.cover
mkdir -p $(GOCOVERDIR) && chmod a+rwx $(GOCOVERDIR)
$(DOCKER_ROOTPRIV_RUN) -e GOCOVERDIR -e TESTS $(UMOCI_IMAGE) make local-test-integration

.PHONY: test-rootless-integration
test-rootless-integration: ci-image umoci.cover
mkdir -p $(GOCOVERDIR) && chmod a+rwx $(GOCOVERDIR)
$(DOCKER_ROOTLESS_RUN) -e GOCOVERDIR -e TESTS $(UMOCI_IMAGE) make local-test-integration

.PHONY: local-test-integration
Expand All @@ -214,7 +221,7 @@ CI_CACHE_PATH ?=.ci-cache
.PHONY: ci-cache
ci-cache: BUILDX_CACHE := \
--cache-from=type=local,src=$(CI_CACHE_PATH) \
--cache-to=type=local,mode=max,dest=$(CI_CACHE_PATH)
--cache-to=type=local,dest=$(CI_CACHE_PATH)
ci-cache: ci-image

.PHONY: ci-image
Expand Down