Skip to content

Commit

Permalink
Merge pull request #130 from frobware/ci-use-podman-and-docker-for-bu…
Browse files Browse the repository at this point in the history
…ild-images

ci: add Podman validation to the build-images step
  • Loading branch information
mergify[bot] authored Sep 26, 2024
2 parents 89c8b97 + 1333584 commit d2eb9f5
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,12 @@ jobs:
git diff --exit-code -I'^ createdAt: ' bundle
kubernetes-integration-tests:
name: Kubernetes Integration Tests (Go ${{ matrix.go }} - amd64)
name: Kubernetes Integration Tests (Go ${{ matrix.go }} - amd64 - ${{ matrix.oci_bin }})
runs-on: ubuntu-latest
strategy:
matrix:
go: ['1.22']
oci_bin: ['docker', 'podman']
env:
BPFMAN_AGENT_IMG: quay.io/bpfman/bpfman-agent:int-test
BPFMAN_OPERATOR_IMG: quay.io/bpfman/bpfman-operator:int-test
Expand Down Expand Up @@ -120,11 +121,19 @@ jobs:
with:
fetch-depth: 0

- name: Build Operator and Agent images
- name: Install OCI runtime (Docker or Podman)
run: |
make build-images
if [ "${{ matrix.oci_bin }}" = "podman" ]; then
sudo apt-get update && sudo apt-get install -y podman
fi
- name: Build Operator and Agent images with ${{ matrix.oci_bin }}
run: |
make OCI_BIN=${{ matrix.oci_bin }} build-images
# Run integration tests only if OCI_BIN is Docker.
- name: Run integration tests
if: ${{ matrix.oci_bin == 'docker' }}
run: |
make test-integration
Expand Down

0 comments on commit d2eb9f5

Please sign in to comment.