cryptsetup2: rebasing on master and testing builds for CircleCI suppo…

…rted boards of linuxboot#876 Adding CircleCI kgpe-d16 confirmity changes to have clearer info on what fails in build and details on CI seperately, as for all other boards.
tlaurion · Dec 10, 2020 · 38a5fc8 · 38a5fc8
1 parent cd16343
commit 38a5fc8
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 24 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -62,10 +62,12 @@ jobs:
       - run:
           name: kgpe-d16_workstation
           command: |
-            rm -rf build/kgpe-d16_workstation/* build/log/* && \
-            make CPUS=4 V=1 BOARD=kgpe-d16_workstation || \
-            (find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
+            rm -rf build/kgpe-d16_workstation/* build/log/* && make CPUS=4 V=1 BOARD=kgpe-d16_workstation || touch /tmp/failed_build
           no_output_timeout: 3h
+      - run:
+          name: Output build failing logs
+          command: |
+            if [[ -f /tmp/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: Ouput kgpe-d16_workstation hashes
           command: |
@@ -80,10 +82,12 @@ jobs:
       - run:
           name: kgpe-d16_workstation-usb_keyboard
           command: |
-            rm -rf build/kgpe-d16_workstation-usb_keyboard/* build/log/* && \
-            make CPUS=4 V=1 BOARD=kgpe-d16_workstation-usb_keyboard || \
-            (find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
+            rm -rf build/kgpe-d16_workstation-usb_keyboard/* build/log/* && make CPUS=4 V=1 BOARD=kgpe-d16_workstation-usb_keyboard || touch /tmp/failed_build
           no_output_timeout: 3h
+      - run:
+          name: Output build failing logs
+          command: |
+            if [[ -f /tmp/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: Ouput kgpe-d16_workstation-usb_keyboard hashes
           command: |
@@ -98,10 +102,12 @@ jobs:
       - run:
           name: kgpe-d16_server
           command: |
-            rm -rf build/kgpe-d16_server/* build/log/* && \
-            make CPUS=4 V=1 BOARD=kgpe-d16_server || \
-            (find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
+            rm -rf build/kgpe-d16_server/* build/log/* && make CPUS=4 V=1 BOARD=kgpe-d16_server || touch /tmp/failed_build
           no_output_timeout: 3h
+      - run:
+          name: Output build failing logs
+          command: |
+            if [[ -f /tmp/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: Ouput kgpe-d16_server hashes
           command: |
@@ -116,10 +122,12 @@ jobs:
       - run:
           name: kgpe-d16_server-whiptail
           command: |
-            rm -rf build/kgpe-d16_server-whiptail/* build/log/* && \
-            make CPUS=4 V=1 BOARD=kgpe-d16_server-whiptail || \
-            (find ./build/ -name "*.log" -type f -mmin -1 | while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log; done; exit 1) \
+            rm -rf build/kgpe-d16_server-whiptail/* build/log/* && make CPUS=4 V=1 BOARD=kgpe-d16_server-whiptail || touch /tmp/failed_build
           no_output_timeout: 3h
+      - run:
+          name: Output build failing logs
+          command: |
+            if [[ -f /tmp/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: Ouput kgpe-d16_server-whiptail hashes
           command: |
@@ -130,6 +138,7 @@ jobs:
              tar zcvf build/kgpe-d16_server-whiptail/logs.tar.gz build/log/*
       - store-artifacts:
           path: build/kgpe-d16_server-whiptail
+
       - run:
           name: librem_l1um
           command: |

diff --git a/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config b/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config
@@ -20,7 +20,7 @@ export CONFIG_LINUX_VERSION=4.14.62
 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-whiptail.config
 CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server-whiptail.config
 
-CONFIG_CRYPTSETUP=y
+CONFIG_CRYPTSETUP2=y
 CONFIG_FLASHROM=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y

diff --git a/boards/kgpe-d16_server/kgpe-d16_server.config b/boards/kgpe-d16_server/kgpe-d16_server.config
@@ -18,7 +18,7 @@ export CONFIG_LINUX_VERSION=4.14.62
 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server.config
 CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server.config
 
-CONFIG_CRYPTSETUP=y
+CONFIG_CRYPTSETUP2=y
 CONFIG_FLASHROM=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y

diff --git a/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config b/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config
@@ -14,7 +14,7 @@ export CONFIG_LINUX_VERSION=4.14.62
 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation-usb_keyboard.config
 CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config
 
-CONFIG_CRYPTSETUP=y
+CONFIG_CRYPTSETUP2=y
 CONFIG_FLASHROM=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y

diff --git a/boards/kgpe-d16_workstation/kgpe-d16_workstation.config b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config
@@ -18,7 +18,7 @@ export CONFIG_LINUX_VERSION=4.14.62
 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation.config
 CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config
 
-CONFIG_CRYPTSETUP=y
+CONFIG_CRYPTSETUP2=y
 CONFIG_FLASHROM=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y

diff --git a/boards/qemu-coreboot-fbwhiptail/qemu-coreboot-fbwhiptail.config b/boards/qemu-coreboot-fbwhiptail/qemu-coreboot-fbwhiptail.config
@@ -19,7 +19,7 @@ CONFIG_FLASHTOOLS=y
 CONFIG_FLASHROM=y
 CONFIG_PCIUTILS=y
 CONFIG_UTIL_LINUX=y
-CONFIG_CRYPTSETUP=y
+CONFIG_CRYPTSETUP2=y
 CONFIG_GPG2=y
 CONFIG_LVM2=y
 CONFIG_MBEDTLS=y

diff --git a/boards/qemu-coreboot/qemu-coreboot.config b/boards/qemu-coreboot/qemu-coreboot.config
@@ -19,7 +19,7 @@ CONFIG_FLASHTOOLS=y
 CONFIG_FLASHROM=y
 CONFIG_PCIUTILS=y
 CONFIG_UTIL_LINUX=y
-CONFIG_CRYPTSETUP=y
+CONFIG_CRYPTSETUP2=y
 CONFIG_GPG2=y
 CONFIG_LVM2=y
 CONFIG_MBEDTLS=y

diff --git a/boards/t420-maximized/t420-maximized.config b/boards/t420-maximized/t420-maximized.config
@@ -18,7 +18,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y
 
-CONFIG_CRYPTSETUP=y
+CONFIG_CRYPTSETUP2=y
 CONFIG_FLASHROM=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y

diff --git a/boards/t430-hotp-maximized/t430-hotp-maximized.config b/boards/t430-hotp-maximized/t430-hotp-maximized.config
@@ -18,7 +18,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y
 
-CONFIG_CRYPTSETUP=y
+CONFIG_CRYPTSETUP2=y
 CONFIG_FLASHROM=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y

diff --git a/boards/t430-maximized/t430-maximized.config b/boards/t430-maximized/t430-maximized.config
@@ -18,7 +18,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y
 
-CONFIG_CRYPTSETUP=y
+CONFIG_CRYPTSETUP2=y
 CONFIG_FLASHROM=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y

diff --git a/boards/x220-maximized/x220-maximized.config b/boards/x220-maximized/x220-maximized.config
@@ -18,7 +18,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y
 
-CONFIG_CRYPTSETUP=y
+CONFIG_CRYPTSETUP2=y
 CONFIG_FLASHROM=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y

diff --git a/boards/x230-hotp-maximized/x230-hotp-maximized.config b/boards/x230-hotp-maximized/x230-hotp-maximized.config
@@ -18,7 +18,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y
 
-CONFIG_CRYPTSETUP=y
+CONFIG_CRYPTSETUP2=y
 CONFIG_FLASHROM=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y

diff --git a/boards/x230-maximized/x230-maximized.config b/boards/x230-maximized/x230-maximized.config
@@ -18,7 +18,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y
 
-CONFIG_CRYPTSETUP=y
+CONFIG_CRYPTSETUP2=y
 CONFIG_FLASHROM=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y