From 7600ce4bff4075aeb4f490bcdcfff597cdfbea74 Mon Sep 17 00:00:00 2001
From: Thierry Laurion <insurgo@riseup.net>
Date: Sun, 24 May 2020 17:12:13 -0400
Subject: [PATCH] GitlabCI: restrict cache, store cleaned build artifacts for
 x230* and qemu-coreboot

---
 .circleci/config.yml | 49 ++++++++++++++++++++++++--------------------
 .gitlab-ci.yml       | 45 ++++++++++++++++++++++++++++++++++------
 2 files changed, 66 insertions(+), 28 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 47a7dab7..fba86d2b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -48,7 +48,7 @@ jobs:
       - run:
           name: qemu-coreboot
           command: |
-            rm -rf build/make-4.2.1/ build/qemu-coreboot/* && make --load 2 \
+            rm -rf build/make-4.2.1/ build/qemu-coreboot/* build/log/* && make --load 2 \
                 V=1 \
                 BOARD=qemu-coreboot \
           no_output_timeout: 3h
@@ -56,15 +56,17 @@ jobs:
           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
 
-      - store-artifacts:
-          path: build/qemu-coreboot/coreboot.rom
-      - store-artifacts:
-          path: build/qemu-coreboot/hashes.txt
       - run:
           name: x230-flash
           command: |
-            make --load 2 \
+            rm -rf build/x230-flash/* build/log/* && make --load 2 \
                 V=1 \
                 BOARD=x230-flash \
           no_output_timeout: 3h
@@ -72,10 +74,17 @@ jobs:
           name: Ouput x230-flash hashes
           command: |
             cat build/x230-flash/hashes.txt \
+      - run:
+          name: Archiving build logs for x230-flash
+          command: |
+             tar zcvf build/x230-flash/logs.tar.gz build/log/*
+      - store-artifacts:
+          path: build/x230-flash
+
       - run:
           name: x230
           command: |
-            make --load 2 \
+            rm -rf build/x230/* build/log/* && make --load 2 \
                 V=1 \
                 BOARD=x230 \
           no_output_timeout: 3h
@@ -83,10 +92,17 @@ jobs:
           name: Ouput x230 hashes
           command: |
             cat build/x230/hashes.txt \
+      - run:
+          name: Archiving build logs for x230
+          command: |
+             tar zcvf build/x230/logs.tar.gz build/log/*
+      - store-artifacts:
+          path: build/x230
+
       - run:
           name: x230-hotp-verification
           command: |
-            make --load 2 \
+            rm -rf build/x230-hotp-verification/* build/log/* && make --load 2 \
                 V=1 \
                 BOARD=x230-hotp-verification \
           no_output_timeout: 3h
@@ -95,22 +111,11 @@ jobs:
           command: |
             cat build/x230-hotp-verification/hashes.txt \
       - run:
-          name: Archiving build logs to bundle in artifacts
+          name: Archiving build logs for x230-hotp-verification
           command: |
-            tar zcvf logs.tar.gz ./build/log/*
-
+             tar zcvf build/x230-hotp-verification/logs.tar.gz build/log/*
       - store-artifacts:
-          path: build/x230-flash/x230-flash.rom
-      - store-artifacts:
-          path: build/x230/coreboot.rom
-      - store-artifacts:
-          path: build/x230/initrd.cpio.xz
-      - store-artifacts:
-          path: build/x230-hotp-verification/coreboot.rom
-      - store-artifacts:
-          path: build/x230-hotp-verification/initrd.cpio.xz
-      - store-artifacts:
-          path: logs.tar.gz
+          path: build/x230-hotp-verification
 
       - save_cache:
           key: heads-{{ .Branch }}{{ .Environment.CACHE_VERSION }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73430244..ccaec947 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,20 +11,53 @@ build:
   retry: 2
   cache:
     paths:
-      - ./
+      - packages
+      - crossgcc
+      - build
     key: "$CI_COMMIT_REF_SLUG"
   script:
     - 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/*
+    - echo "Building BOARD=x230-flash board..."
+    - make BOARD=x230-flash || (find ./build/log/ -cmin 1|xargs tail; exit 1)
+    - echo "x230-flash hashes:"
+    - cat ./build/x230-flash/hashes.txt
+    - echo "Archiving x230-flash logs..."
+    - tar zcvf ./build/x230-flash/logs.tar.gz ./build/log/*
+    - echo "Removing old x230-hotp-verification artifacts..."
+    - rm -rf ./build/x230-hotp-verification/*
+    - rm -rf ./build/log/*
     - echo "Building BOARD=x230-hotp-verification board..."
     - make BOARD=x230-hotp-verification || (find ./build/log/ -cmin 1|xargs tail; exit 1)
     - echo "x230-hotp-verification hashes:"
     - cat ./build/x230-hotp-verification/hashes.txt
-    - tar zcvf logs.tar.gz ./build/log/*
+    - echo "Archiving x230-hotp-verification logs..."
+    - tar zcvf ./build/x230-hotp-verification/logs.tar.gz ./build/log/*
+    - echo "Removing old x230 artifacts..."
+    - rm -rf ./build/x230/*
+    - rm -rf ./build/log/*
+    - echo "Building BOARD=x230 board..."
+    - make BOARD=x230 || (find ./build/log/ -cmin 1|xargs tail; exit 1)
+    - echo "x230 hashes:"
+    - cat ./build/x230/hashes.txt
+    - echo "Archiving x230 logs..."
+    - tar zcvf ./build/x230/logs.tar.gz ./build/log/*
   artifacts:
     paths:
-      - ./build/x230-hotp-verification/coreboot.rom
-      - ./build/x230-hotp-verification/hashes.txt
-      - ./build/x230-hotp-verification/initrd.cpio.xz
-      - ./logs.tar.gz
+      - ./build/qemu-coreboot
+      - ./build/x230-flash
+      - ./build/x230-hotp-verification
+      - ./build/x230