From 5faa6370d0208f039430ace29d6cc12d4955bf8f Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Wed, 5 Feb 2025 10:48:10 -0500 Subject: [PATCH] Add RHEL dockerfiles to regular build CI --- .github/workflows/build.yaml | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 18576d68f2..4c7aed037c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,6 +10,9 @@ on: jobs: build-autoscaler: + strategy: + matrix: + dockerfile: ['Dockerfile', 'Dockerfile.rhel'] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -22,7 +25,12 @@ jobs: push: false tags: autoscaler:pr-${{ github.event.number }} build-args: SERVICE_NAME=autoscaler + file: ${{ matrix.dockerfile }} + build-scheduler: + strategy: + matrix: + dockerfile: ['Dockerfile', 'Dockerfile.rhel'] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -35,7 +43,12 @@ jobs: push: false tags: scheduler:pr-${{ github.event.number }} build-args: SERVICE_NAME=scheduler + file: ${{ matrix.dockerfile }} + build-and-test-instrumentor: + strategy: + matrix: + dockerfile: ['Dockerfile', 'Dockerfile.rhel'] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -51,11 +64,16 @@ jobs: push: false tags: instrumentor:pr-${{ github.event.number }} build-args: SERVICE_NAME=instrumentor + file: ${{ matrix.dockerfile }} - name: run tests working-directory: ./instrumentor run: | make test + build-and-test-odigos-collector: + strategy: + matrix: + dockerfile: ['Dockerfile', 'Dockerfile.rhel'] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -68,12 +86,16 @@ jobs: push: false tags: odigos-collector:pr-${{ github.event.number }} context: ./collector - file: collector/Dockerfile + file: ${{ matrix.dockerfile }} - name: run tests working-directory: ./collector run: | make test + build-and-test-odiglet: + strategy: + matrix: + dockerfile: ['odiglet/Dockerfile', 'odiglet/Dockerfile.rhel'] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -85,7 +107,7 @@ jobs: uses: docker/build-push-action@v6 with: platforms: linux/amd64,linux/arm64 - file: odiglet/Dockerfile + file: ${{ matrix.dockerfile }} context: . push: false tags: odiglet:pr-${{ github.event.number }} @@ -96,7 +118,11 @@ jobs: working-directory: ./odiglet run: | make test + build-frontend: + strategy: + matrix: + dockerfile: ['frontend/Dockerfile', 'frontend/Dockerfile.rhel'] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4