Skip to content

Commit d2eb9f5

Browse files
authored
Merge pull request #130 from frobware/ci-use-podman-and-docker-for-build-images
ci: add Podman validation to the build-images step
2 parents 89c8b97 + 1333584 commit d2eb9f5

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

.github/workflows/pull_request.yml

+12-3
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,12 @@ jobs:
7878
git diff --exit-code -I'^ createdAt: ' bundle
7979
8080
kubernetes-integration-tests:
81-
name: Kubernetes Integration Tests (Go ${{ matrix.go }} - amd64)
81+
name: Kubernetes Integration Tests (Go ${{ matrix.go }} - amd64 - ${{ matrix.oci_bin }})
8282
runs-on: ubuntu-latest
8383
strategy:
8484
matrix:
8585
go: ['1.22']
86+
oci_bin: ['docker', 'podman']
8687
env:
8788
BPFMAN_AGENT_IMG: quay.io/bpfman/bpfman-agent:int-test
8889
BPFMAN_OPERATOR_IMG: quay.io/bpfman/bpfman-operator:int-test
@@ -120,11 +121,19 @@ jobs:
120121
with:
121122
fetch-depth: 0
122123

123-
- name: Build Operator and Agent images
124+
- name: Install OCI runtime (Docker or Podman)
124125
run: |
125-
make build-images
126+
if [ "${{ matrix.oci_bin }}" = "podman" ]; then
127+
sudo apt-get update && sudo apt-get install -y podman
128+
fi
126129
130+
- name: Build Operator and Agent images with ${{ matrix.oci_bin }}
131+
run: |
132+
make OCI_BIN=${{ matrix.oci_bin }} build-images
133+
134+
# Run integration tests only if OCI_BIN is Docker.
127135
- name: Run integration tests
136+
if: ${{ matrix.oci_bin == 'docker' }}
128137
run: |
129138
make test-integration
130139

0 commit comments

Comments
 (0)