Merge pull request #1118 from sustainable-computing-io/new_build_process

New build process

.github/workflows/image.yml

@@ -25,16 +25,6 @@ jobs:
         username: ${{ secrets.username }}
         password: ${{ secrets.password }}
 
-    - name: Build and push kepler latest (bcc)
-      uses: docker/build-push-action@v5
-      with:
-          context: .
-          platforms: linux/amd64
-          push: true
-          tags: quay.io/sustainable_computing_io/kepler:latest-bcc
-          labels: latest-bcc
-          file: build/Dockerfile
-
     - name: Build and push kepler latest (libbpf)
       uses: docker/build-push-action@v5
       with:
@@ -43,4 +33,4 @@ jobs:
           push: true
           tags: quay.io/sustainable_computing_io/kepler:latest
           labels: latest
-          file: build/Dockerfile.libbpf.kepler
+          file: build/Dockerfile

.github/workflows/image_base.yml

@@ -1,9 +1,7 @@
 name: base
 
 on:
-  push:
-    branches: 
-      - 'base'
+  workflow_dispatch:
 
 jobs:
   baseimagebuild:
@@ -21,45 +19,13 @@ jobs:
             registry: quay.io/sustainable_computing_io
             username: ${{ secrets.BOT_NAME }}
             password: ${{ secrets.BOT_TOKEN }}
-      - name: Build and push bcc-amd64
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./build/Dockerfile.bcc.base
-          platforms: linux/amd64
-          push: true
-          tags: quay.io/sustainable_computing_io/kepler_base:latest-bcc-amd64
-      - name: Build and push bcc-s390x
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./build/Dockerfile.bcc.base.s390x
-          platforms: linux/s390x
-          push: true
-          tags: quay.io/sustainable_computing_io/kepler_base:latest-bcc-s390x
-      - name: Build and push bcc-arm64
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./build/Dockerfile.bcc.base.arm64
-          platforms: linux/arm64
-          push: true
-          tags: quay.io/sustainable_computing_io/kepler_base:latest-bcc-arm64
-      - name: Build and push libbpf-amd64
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./build/Dockerfile.libbpf.base
-          platforms: linux/amd64
-          push: true
-          tags: quay.io/sustainable_computing_io/kepler_base:latest-libbpf-amd64
       - name: Build and push a base image for building Kepler with libbpf
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./Dockerfile.base
+          file: ./build/Dockerfile.builder
           platforms: linux/amd64
           push: true
-          tags: quay.io/sustainable_computing_io/kepler_base:latest-libbpf-amd64-simplified
+          tags: quay.io/sustainable_computing_io/kepler_builder:ubi-9-libbpf-1.2.0
       - name: Create and upload multi-arch image
         run: make multi-arch-image-base

.github/workflows/platform-validation.yml

@@ -136,7 +136,7 @@ jobs:
         uses: sustainable-computing-io/[email protected]
         with:
           cluster_provider: ${{matrix.cluster_provider}}
-          ebpfprovider: bcc
+          ebpfprovider: libbpf
           local_dev_cluster_version: v0.0.3
           prometheus_enable: true
           grafana_enable: true

.github/workflows/pull_request.yml

@@ -18,9 +18,6 @@ jobs:
   # for each PR ensure for local developer usage
   developer_local:
     uses: ./.github/workflows/developer_local.yml
-  # for each PR run integration test
-  integration_test_bcc:
-    uses: ./.github/workflows/integration_test_bcc.yml
   # for each PR run integration test    
   integration_test:
     uses: ./.github/workflows/integration_test.yml

.github/workflows/release.yml

@@ -124,16 +124,6 @@ jobs:
         username: ${{ secrets.BOT_NAME }}
         password: ${{ secrets.BOT_TOKEN }}
 
-    - name: Build and push kepler latest bcc image
-      uses: docker/build-push-action@v5
-      with:
-          context: .
-          platforms: linux/amd64
-          push: true
-          tags: quay.io/sustainable_computing_io/kepler:latest, quay.io/sustainable_computing_io/kepler:${{ github.event.inputs.release }}-bcc
-          labels: latest, ${{ github.event.inputs.release }}, bcc
-          file: build/Dockerfile
-
     - name: Build and push kepler latest libbpf image
       uses: docker/build-push-action@v5
       with:
@@ -142,7 +132,7 @@ jobs:
           push: true
           tags: quay.io/sustainable_computing_io/kepler:latest, quay.io/sustainable_computing_io/kepler:${{ github.event.inputs.release }}
           labels: latest, ${{ github.event.inputs.release }}, libbpf
-          file: build/Dockerfile.libbpf.kepler
+          file: build/Dockerfile
 
     - name: Generate SBOM
       uses: anchore/[email protected]