Retry CircleCI for 4.11 on Debian 10 docker

- Add kgpe-d16 patch to remove HID for PCI devices (successful build on top of #1101 and #1012 per https://app.circleci.com/pipelines/github/tlaurion/heads/937/workflows/de49bea0-3f58-4a91-8891-87622f5a0eed)
- CircleCI modified to build for coreboot 4.11 kgpe-d16_workstation on top of 4.15 passed workspace
- CircleCI modified so that we still archive all the logs in artifacts for the current build even if failing. We now exit 1 after having archived all the log files under build/
This commit is contained in:
Thierry Laurion 2022-01-31 10:57:24 -05:00 committed by tlaurion
parent 1693644d56
commit 4b260071c3
2 changed files with 61 additions and 38 deletions

View File

@ -11,6 +11,7 @@ commands:
- run:
name: Install dependencies
command: |
ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
apt update
apt install -y build-essential zlib1g-dev uuid-dev libdigest-sha-perl libelf-dev bc bzip2 bison flex git gnupg iasl m4 nasm patch python python2 python3 wget gnat cpio ccache pkg-config cmake libusb-1.0-0-dev autoconf texinfo ncurses-dev doxygen graphviz udev libudev1 libudev-dev automake libtool rsync innoextract sudo
- run:
@ -18,10 +19,6 @@ commands:
command: |
rm -rf build/<<parameters.target>>/* build/log/* && make V=1 BOARD=<<parameters.target>> <<parameters.subcommand>> || touch ./tmpDir/failed_build
no_output_timeout: 3h
- run:
name: Output build failing logs
command: |
if [[ -f ./tmpDir/failed_build ]]; then find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1;else echo "Not failing. Continuing..."; fi \
- run:
name: Output hashes
command: |
@ -29,7 +26,11 @@ commands:
- run:
name: Archiving build logs.
command: |
tar zcvf build/<<parameters.target>>/logs.tar.gz build/log/*
tar zcvf build/<<parameters.target>>/logs.tar.gz $(find build/ -name "*.log")
- run:
name: Output build failing logs
command: |
if [[ -f ./tmpDir/failed_build ]]; then find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1;else echo "Step hasn't failed. Continuing with next step..."; fi \
- store_artifacts:
path: build/<<parameters.target>>
@ -42,6 +43,7 @@ jobs:
- run:
name: Install dependencies
command: |
ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
apt update
apt install -y build-essential zlib1g-dev uuid-dev libdigest-sha-perl libelf-dev bc bzip2 bison flex git gnupg iasl m4 nasm patch python python2 python3 wget gnat cpio ccache pkg-config cmake libusb-1.0-0-dev autoconf texinfo ncurses-dev doxygen graphviz udev libudev1 libudev-dev automake libtool rsync innoextract sudo
- checkout
@ -131,6 +133,7 @@ jobs:
build:
docker:
- image: debian:10
resource_class: large
parameters:
target:
type: string
@ -146,6 +149,7 @@ jobs:
save_cache:
docker:
- image: debian:10
resource_class: large
steps:
- attach_workspace:
at: ~/
@ -211,17 +215,19 @@ workflows:
- x230-hotp-maximized
# Coreboot 4.11
#- build_and_persist:
# name: librem_l1um
# target: librem_l1um
# subcommand: ""
# requires:
# - x230-hotp-maximized
- save_cache:
- build_and_persist:
name: kgpe-d16_workstation
target: kgpe-d16_workstation
subcommand: ""
requires:
- librem_14
#Cache one workspace per Coreboot version, ideally the boards including the highest number of modules, since not rebuilt across builds.
#Below, 4.11, 4.13, 4.15
- save_cache:
requires:
- kgpe-d16_workstation
#
#
# Those onboarding new boards should add their entries below.
@ -452,34 +458,33 @@ workflows:
requires:
- librem_14
#KGPE-D16 turned off because CircleCI built time needs to be optimized. Kernel doesn't seem to enforce MAKE_JOBS properly
#- build:
# name: kgpe-d16_workstation-usb_keyboard
# target: kgpe-d16_workstation-usb_keyboard
# subcommand: ""
# requires:
# - librem_l1um
- build:
name: kgpe-d16_workstation-usb_keyboard
target: kgpe-d16_workstation-usb_keyboard
subcommand: ""
requires:
- kgpe-d16_workstation
#- build:
# name: kgpe-d16_server
# target: kgpe-d16_server
# subcommand: ""
# requires:
# - librem_l1um
- build:
name: kgpe-d16_server
target: kgpe-d16_server
subcommand: ""
requires:
- kgpe-d16_workstation
#- build:
# name: kgpe-d16_server-whiptail
# target: kgpe-d16_server-whiptail
# subcommand: ""
# requires:
# - librem_l1um
- build:
name: kgpe-d16_server-whiptail
target: kgpe-d16_server-whiptail
subcommand: ""
requires:
- kgpe-d16_workstation
#- build:
# name: kgpe-d16_workstation
# target: kgpe-d16_workstation
# subcommand: ""
# requires:
# - librem_l1um
- build:
name: librem_l1um
target: librem_l1um
subcommand: ""
requires:
- kgpe-d16_workstation
########################
########################

View File

@ -0,0 +1,18 @@
--- ./src/mainboard/asus/kgpe-d16/dsdt.asl.orig 2021-10-15 16:17:56.496000000 -0400
+++ ./src/mainboard/asus/kgpe-d16/dsdt.asl 2021-10-15 16:27:27.393000000 -0400
@@ -126,7 +126,6 @@
{
/* BUS0 root bus */
- Name (_HID, EisaId ("PNP0A08")) /* PCI-e root bus (SR5690) */
Name (_CID, EisaId ("PNP0A03")) /* PCI root bus (SP5100) */
Name (_ADR, 0x00180001)
Name (_UID, 0x00)
@@ -483,7 +482,6 @@
/* 0:14.3 SP5100 LPC */
Device (LPC) {
- Name (_HID, EisaId ("PNP0A05"))
Name (_ADR, 0x00140003)
/* Real Time Clock Device */