Skip to content

Commit 5a0b54f

Browse files
committed
[test] try codebuild image override
1 parent da04d47 commit 5a0b54f

File tree

1 file changed

+34
-29
lines changed

1 file changed

+34
-29
lines changed

.github/workflows/kernel-build.yml

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,17 @@ jobs:
4949
# To run on CodeBuild, runs-on value must correspond to the AWS
5050
# CodeBuild project associated with the kernel-patches webhook
5151
# However matrix.py passes just a 'codebuild' string
52-
runs-on: >-
53-
${{
54-
contains(fromJSON(inputs.runs_on), 'codebuild')
55-
&& format('codebuild-bpf-ci-{0}-{1}', github.run_id, github.run_attempt)
56-
|| fromJSON(inputs.runs_on)
57-
}}
52+
# runs-on: >-
53+
# ${{
54+
# contains(fromJSON(inputs.runs_on), 'codebuild')
55+
# && format('codebuild-bpf-ci-{0}-{1}', github.run_id, github.run_attempt)
56+
# || fromJSON(inputs.runs_on)
57+
# }}
58+
runs-on:
59+
- ${{ format('codebuild-bpf-ci-{0}-{1}', github.run_id, github.run_attempt) }}
60+
- image:custom-linux-ghcr.io/kernel-patches/runner:debian-x86_64
61+
# - image:linux-5.0
62+
# container: ghcr.io/kernel-patches/runner:debian-x86_64
5863
env:
5964
ARTIFACTS_ARCHIVE: "vmlinux-${{ inputs.arch }}-${{ inputs.toolchain_full }}.tar.zst"
6065
BPF_NEXT_BASE_BRANCH: 'master'
@@ -67,21 +72,21 @@ jobs:
6772
REFERENCE_REPO_PATH: /libbpfci/mirrors/linux
6873
REPO_PATH: ""
6974
REPO_ROOT: ${{ github.workspace }}
70-
RUNNER_TYPE: ${{ contains(fromJSON(inputs.runs_on), 'codebuild') && 'codebuild' || 'default' }}
75+
RUNNER_TYPE: codebuild # ${{ contains(fromJSON(inputs.runs_on), 'codebuild') && 'codebuild' || 'default' }}
7176
steps:
7277

73-
# git version 2.43.0 (current Ubuntu 24 installation)
74-
# does not support git clone --revision option
75-
# so make sure latest git is installed
76-
- name: Install latest git
77-
shell: bash
78-
run: |
79-
sudo apt-get update
80-
sudo apt-get install -y software-properties-common
81-
sudo add-apt-repository -y ppa:git-core/ppa
82-
sudo apt-get update
83-
sudo apt-get install -y git
84-
git --version
78+
# # git version 2.43.0 (current Ubuntu 24 installation)
79+
# # does not support git clone --revision option
80+
# # so make sure latest git is installed
81+
# - name: Install latest git
82+
# shell: bash
83+
# run: |
84+
# sudo apt-get update
85+
# sudo apt-get install -y software-properties-common
86+
# sudo add-apt-repository -y ppa:git-core/ppa
87+
# sudo apt-get update
88+
# sudo apt-get install -y git
89+
# git --version
8590

8691
- uses: actions/checkout@v4
8792
with:
@@ -145,7 +150,7 @@ jobs:
145150
repo-root: ${{ env.REPO_ROOT }}
146151

147152
- name: Setup build environment
148-
uses: libbpf/ci/setup-build-env@v3
153+
uses: libbpf/ci/setup-build-env@debian-build-env
149154
with:
150155
arch: ${{ inputs.arch }}
151156
gcc-version: ${{ inputs.gcc_version }}
@@ -155,14 +160,14 @@ jobs:
155160
# We have to setup qemu+binfmt in order to enable cross-compation of selftests.
156161
# During selftests build, freshly built bpftool is executed.
157162
# On self-hosted bare-metal hosts binfmt is pre-configured.
158-
- if: ${{ env.RUNNER_TYPE == 'codebuild' && env.CROSS_COMPILE }}
159-
name: Set up docker
160-
uses: docker/setup-docker-action@v4
161-
- if: ${{ env.RUNNER_TYPE == 'codebuild' && env.CROSS_COMPILE }}
162-
name: Setup binfmt and qemu
163-
uses: docker/setup-qemu-action@v3
164-
with:
165-
image: tonistiigi/binfmt:qemu-v9.2.0
163+
# - if: ${{ env.RUNNER_TYPE == 'codebuild' && env.CROSS_COMPILE }}
164+
# name: Set up docker
165+
# uses: docker/setup-docker-action@v4
166+
# - if: ${{ env.RUNNER_TYPE == 'codebuild' && env.CROSS_COMPILE }}
167+
# name: Setup binfmt and qemu
168+
# uses: docker/setup-qemu-action@v3
169+
# with:
170+
# image: tonistiigi/binfmt:qemu-v9.2.0
166171

167172
- name: Build kernel image
168173
uses: libbpf/ci/build-linux@v3
@@ -174,7 +179,7 @@ jobs:
174179
llvm-version: ${{ inputs.llvm_version }}
175180

176181
- name: Build selftests/bpf
177-
uses: libbpf/ci/build-selftests@v3
182+
uses: libbpf/ci/build-selftests@debian-build-env
178183
env:
179184
MAX_MAKE_JOBS: 32
180185
RELEASE: ${{ inputs.release && '1' || '' }}

0 commit comments

Comments
 (0)