Skip to content

Try to prevent harder buildbot failures #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ynezz wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Try to prevent harder buildbot failures #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72bf8e4
Bump buildworker containers to v3.11.8 v21
ynezz Nov 6, 2024
53cd7be
Try to prevent harder buildbot failures
ynezz Jan 7, 2024
27eb2d8
Enable smoke testing of the tools
ynezz Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/dockerfiles/Dockerfile.tools
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/openwrt/buildbot/buildworker-v3.8.0:v9
FROM ghcr.io/openwrt/buildbot/buildworker-v3.11.8:v21@sha256:fcebfe9792fa5db122d68fe781c5e45af7abf1ab5968ed1e040b48663aea1528

COPY --chown=buildbot staging_dir/host /prebuilt_tools/staging_dir/host
COPY --chown=buildbot build_dir/host /prebuilt_tools/build_dir/host
2 changes: 2 additions & 0 deletions .github/workflows/label-target.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ jobs:
target: ${{ needs.set_target.outputs.target }}
subtarget: ${{ needs.set_target.outputs.subtarget }}
build_full: true
build_ib_sdk: true
build_bpf_toolchain: true
build_all_kmods: true
build_all_boards: true
build_all_modules: true
2 changes: 2 additions & 0 deletions .github/workflows/packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ jobs:
build_all_kmods: true
build_all_modules: true
build_full: true
build_ib_sdk: true
build_bpf_toolchain: true
ccache_type: packages
upload_ccache_cache: ${{ github.repository_owner == 'openwrt' }}
check_packages_list: ${{ needs.determine_changed_packages.outputs.changed_packages }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_build-tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
build:
name: Build tools
runs-on: ubuntu-latest
container: ghcr.io/openwrt/buildbot/buildworker-v3.8.0:v9
container: ghcr.io/openwrt/buildbot/buildworker-v3.11.8:v21@sha256:fcebfe9792fa5db122d68fe781c5e45af7abf1ab5968ed1e040b48663aea1528

steps:
- name: Checkout
Expand Down
55 changes: 55 additions & 0 deletions .github/workflows/reusable_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ on:
type: boolean
build_all_boards:
type: boolean
build_ib_sdk:
type: boolean
build_bpf_toolchain:
type: boolean
use_openwrt_container:
type: boolean
default: true
Expand Down Expand Up @@ -449,6 +453,33 @@ jobs:
run: |
echo CONFIG_KERNEL_WERROR=y >> .config

- name: Configure various options which are used on buildbots
shell: su buildbot -c "sh -e {0}"
working-directory: openwrt
run: |
echo CONFIG_JSON_CYCLONEDX_SBOM=y >> .config
echo CONFIG_COLLECT_KERNEL_DEBUG=y >> .config
echo CONFIG_REPRODUCIBLE_DEBUG_INFO=y >> .config
echo CONFIG_KERNEL_BUILD_USER="builder" >> .config
echo CONFIG_KERNEL_BUILD_DOMAIN="buildhost" >> .config

- name: Configure BPF options as used on buildbots
shell: su buildbot -c "sh -e {0}"
if: inputs.build_bpf_toolchain == true
working-directory: openwrt
run: |
echo CONFIG_DEVEL=y >> .config
echo CONFIG_SDK_LLVM_BPF=y >> .config
Copy link
Member Author

@ynezz ynezz Jan 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm unsure where to put this config option, had it initially in the next Configure SDK and IB options used on buildbots step, will recheck later.

echo CONFIG_BPF_TOOLCHAIN_BUILD_LLVM=y >> .config

- name: Configure SDK and IB options used on buildbots
shell: su buildbot -c "sh -e {0}"
if: inputs.build_ib_sdk == true
working-directory: openwrt
run: |
echo CONFIG_IB=y >> .config
echo CONFIG_SDK=y >> .config

- name: Configure all kernel modules
if: inputs.build_all_kmods == true
shell: su buildbot -c "sh -e {0}"
Expand Down Expand Up @@ -620,12 +651,36 @@ jobs:
working-directory: openwrt
run: make -j$(nproc) BUILD_LOG=1 || ret=$? .github/workflows/scripts/show_build_failures.sh

- name: Check SDK
if: inputs.build_ib_sdk == true
shell: su buildbot -c "sh -e {0}"
working-directory: openwrt
run: .github/workflows/scripts/tools-smoke-test.sh sdk ${{ inputs.target }} ${{ inputs.subtarget }}

- name: Check ImageBuilder
if: inputs.build_ib_sdk == true
shell: su buildbot -c "sh -e {0}"
working-directory: openwrt
run: .github/workflows/scripts/tools-smoke-test.sh imagebuilder ${{ inputs.target }} ${{ inputs.subtarget }}

- name: Check BPF toolchain
if: inputs.build_bpf_toolchain == true
shell: su buildbot -c "sh -e {0}"
working-directory: openwrt
run: .github/workflows/scripts/tools-smoke-test.sh bpf ${{ inputs.target }} ${{ inputs.subtarget }}

- name: Build external toolchain
if: inputs.build_external_toolchain == true
shell: su buildbot -c "sh -e {0}"
working-directory: openwrt
run: make target/toolchain/compile -j$(nproc) BUILD_LOG=1 || ret=$? .github/workflows/scripts/show_build_failures.sh

- name: Check external toolchain
if: inputs.build_external_toolchain == true
shell: su buildbot -c "sh -e {0}"
working-directory: openwrt
run: .github/workflows/scripts/tools-smoke-test.sh toolchain ${{ inputs.target }} ${{ inputs.subtarget }}

- name: Coverity prepare toolchain
if: inputs.coverity_check_packages != ''
shell: su buildbot -c "sh -e {0}"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/toolchain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,4 @@ jobs:
target: ${{ matrix.target }}
subtarget: ${{ matrix.subtarget }}
build_toolchain: true
build_bpf_toolchain: true