From dcbeb26e035110e82eda40a9732736fb0cfdf12f Mon Sep 17 00:00:00 2001
From: Thierry Laurion <insurgo@riseup.net>
Date: Sat, 6 Jun 2020 12:35:13 -0400
Subject: [PATCH] CIs: move qemu-coreboot to be built last, add t430 and
 t430-flash boards to CIs

---
 .circleci/config.yml | 74 ++++++++++++++++++++++++++++++++------------
 .gitlab-ci.yml       | 40 ++++++++++++++++++------
 2 files changed, 86 insertions(+), 28 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fba86d2b..0648492c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,25 +44,6 @@ jobs:
 #      - store-artifacts:
 #          path: build/qemu-linuxboot/hashes.txt
 
-
-      - run:
-          name: qemu-coreboot
-          command: |
-            rm -rf build/make-4.2.1/ build/qemu-coreboot/* build/log/* && make --load 2 \
-                V=1 \
-                BOARD=qemu-coreboot \
-          no_output_timeout: 3h
-      - run:
-          name: Output qemu-coreboot hashes
-          command: |
-             cat build/qemu-coreboot/hashes.txt \
-      - run:
-          name: Archiving build logs for qemu-coreboot
-          command: |
-             tar zcvf build/qemu-coreboot/logs.tar.gz build/log/*
-      - store-artifacts:
-          path: build/qemu-coreboot
-
       - run:
           name: x230-flash
           command: |
@@ -81,6 +62,42 @@ jobs:
       - store-artifacts:
           path: build/x230-flash
 
+      - run:
+          name: t430-flash
+          command: |
+            rm -rf build/t430-flash/* build/log/* && make --load 2 \
+                V=1 \
+                BOARD=t430-flash \
+          no_output_timeout: 3h
+      - run:
+          name: Ouput t430-flash hashes
+          command: |
+            cat build/t430-flash/hashes.txt \
+      - run:
+          name: Archiving build logs for t430-flash
+          command: |
+             tar zcvf build/t430-flash/logs.tar.gz build/log/*
+      - store-artifacts:
+          path: build/t430-flash
+
+      - run:
+          name: t430
+          command: |
+            rm -rf build/t430/* build/log/* && make --load 2 \
+                V=1 \
+                BOARD=t430 \
+          no_output_timeout: 3h
+      - run:
+          name: Ouput t430 hashes
+          command: |
+            cat build/t430/hashes.txt \
+      - run:
+          name: Archiving build logs for t430
+          command: |
+             tar zcvf build/t430/logs.tar.gz build/log/*
+      - store-artifacts:
+          path: build/t430
+
       - run:
           name: x230
           command: |
@@ -99,6 +116,7 @@ jobs:
       - store-artifacts:
           path: build/x230
 
+
       - run:
           name: x230-hotp-verification
           command: |
@@ -117,6 +135,24 @@ jobs:
       - store-artifacts:
           path: build/x230-hotp-verification
 
+      - run:
+          name: qemu-coreboot
+          command: |
+            rm -rf build/make-4.2.1/ build/qemu-coreboot/* build/log/* && make --load 2 \
+                V=1 \
+                BOARD=qemu-coreboot \
+          no_output_timeout: 3h
+      - run:
+          name: Output qemu-coreboot hashes
+          command: |
+             cat build/qemu-coreboot/hashes.txt \
+      - run:
+          name: Archiving build logs for qemu-coreboot
+          command: |
+             tar zcvf build/qemu-coreboot/logs.tar.gz build/log/*
+      - store-artifacts:
+          path: build/qemu-coreboot
+
       - save_cache:
           key: heads-{{ .Branch }}{{ .Environment.CACHE_VERSION }}
           paths:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ccaec947..98bdcdc1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,15 +19,6 @@ build:
     - dnf install -y @development-tools gcc-c++ gcc-gnat zlib-devel perl-Digest-MD5 perl-Digest-SHA uuid-devel pcsc-tools ncurses-devel lbzip2 libuuid-devel lzma elfutils-libelf-devel bc bzip2 bison flex git gnupg iasl m4 nasm patch python wget libusb-devel cmake automake pv bsdiff autoconf libtool cpio texinfo
     - git fetch origin 
     - git reset --hard origin/$CI_COMMIT_REF_NAME
-    - echo "Removing old qemu-coreboot artifacts..."
-    - rm -rf ./build/qemu-coreboot/*
-    - rm -rf ./build/log/*
-    - echo "Building BOARD=qemu-coreboot board..."
-    - make BOARD=qemu-coreboot || (find ./build/log/ -cmin 1|xargs tail; exit 1)
-    - echo "qemu-coreboot hashes:"
-    - cat ./build/qemu-coreboot/hashes.txt
-    - echo "Archiving qemu-coreboot logs..."
-    - tar zcvf ./build/qemu-coreboot/logs.tar.gz ./build/log/*
     - echo "Removing old x230-flash artifacts..."
     - rm -rf ./build/x230-flash/*
     - rm -rf ./build/log/*
@@ -37,6 +28,15 @@ build:
     - cat ./build/x230-flash/hashes.txt
     - echo "Archiving x230-flash logs..."
     - tar zcvf ./build/x230-flash/logs.tar.gz ./build/log/*
+    - echo "Removing old t430-flash artifacts..."
+    - rm -rf ./build/t430-flash/*
+    - rm -rf ./build/log/*
+    - echo "Building BOARD=t430-flash board..."
+    - make BOARD=t430-flash || (find ./build/log/ -cmin 1|xargs tail; exit 1)
+    - echo "t430-flash hashes:"
+    - cat ./build/t430-flash/hashes.txt
+    - echo "Archiving t430-flash logs..."
+    - tar zcvf ./build/t430-flash/logs.tar.gz ./build/log/*
     - echo "Removing old x230-hotp-verification artifacts..."
     - rm -rf ./build/x230-hotp-verification/*
     - rm -rf ./build/log/*
@@ -55,9 +55,31 @@ build:
     - cat ./build/x230/hashes.txt
     - echo "Archiving x230 logs..."
     - tar zcvf ./build/x230/logs.tar.gz ./build/log/*
+
+    - echo "Removing old t430 artifacts..."
+    - rm -rf ./build/t430/*
+    - rm -rf ./build/log/*
+    - echo "Building BOARD=t430 board..."
+    - make BOARD=t430 || (find ./build/log/ -cmin 1|xargs tail; exit 1)
+    - echo "t430 hashes:"
+    - cat ./build/t430/hashes.txt
+    - echo "Archiving t430 logs..."
+    - tar zcvf ./build/t430/logs.tar.gz ./build/log/*
+
+    - echo "Removing old qemu-coreboot artifacts..."
+    - rm -rf ./build/qemu-coreboot/*
+    - rm -rf ./build/log/*
+    - echo "Building BOARD=qemu-coreboot board..."
+    - make BOARD=qemu-coreboot || (find ./build/log/ -cmin 1|xargs tail; exit 1)
+    - echo "qemu-coreboot hashes:"
+    - cat ./build/qemu-coreboot/hashes.txt
+    - echo "Archiving qemu-coreboot logs..."
+    - tar zcvf ./build/qemu-coreboot/logs.tar.gz ./build/log/*
   artifacts:
     paths:
       - ./build/qemu-coreboot
       - ./build/x230-flash
+      - ./build/t430-flash
       - ./build/x230-hotp-verification
       - ./build/x230
+      - ./build/t430