Skip to content

Commit

Permalink
build: use the latest builder image (#1108)
Browse files Browse the repository at this point in the history
* build: use the latest builder image

Signed-off-by: Huamin Chen <[email protected]>

* update github workflow

Signed-off-by: Huamin Chen <[email protected]>

---------

Signed-off-by: Huamin Chen <[email protected]>
  • Loading branch information
rootfs committed Dec 11, 2023
1 parent 037a1a4 commit 91efbaa
Show file tree
Hide file tree
Showing 22 changed files with 38 additions and 669 deletions.
12 changes: 1 addition & 11 deletions .github/workflows/image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
26 changes: 1 addition & 25 deletions .github/workflows/image_base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,30 +21,6 @@ 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:
Expand All @@ -57,7 +33,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfile.builder
file: ./build/Dockerfile.builder
platforms: linux/amd64
push: true
tags: quay.io/sustainable_computing_io/kepler_builder:ubi-9-libbpf-1.2.0
Expand Down
123 changes: 0 additions & 123 deletions .github/workflows/integration_test_bcc.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/platform-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 1 addition & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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]
Expand Down
34 changes: 0 additions & 34 deletions Dockerfile

This file was deleted.

33 changes: 0 additions & 33 deletions Dockerfile.base

This file was deleted.

Loading

0 comments on commit 91efbaa

Please sign in to comment.