Merge branch 'adam-ci-test' into 'master'

.gitlab-ci.yml: CI fixes See merge request be-cem-edl/chronos/wr2rf-vme!3

Merge branch 'adam-ci-test' into 'master'
.gitlab-ci.yml: CI fixes See merge request be-cem-edl/chronos/wr2rf-vme!3
df4dcc84 · Adam Wujek · a46bb911 · 0192d48a · df4dcc84 · df4dcc84
Commit df4dcc84 authored Jun 16, 2023 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

.gitlab-ci.yml .gitlab-ci.yml +7 -1

build-wr2rf.sh ci-scripts/build-wr2rf.sh +4 -1

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ stages:          # List of stages for jobs, and their order of execution
  - release

 variables:
-  _BITSTREAM_DEST: $CI_PROJECT_DIR/$EDL_CI_EOS_OUTPUT_DIR/bitstream
+  _BITSTREAM_DEST: $CI_PROJECT_DIR/${EDL_CI_EOS_OUTPUT_DIR}bitstream
  _FIRMWARE_DEST: $CI_PROJECT_DIR/$EDL_CI_EOS_OUTPUT_DIR/firmware
  _TOOLS_DEST: $CI_PROJECT_DIR/$EDL_CI_EOS_OUTPUT_DIR/tools

@@ -108,6 +108,8 @@ build-wr2rf:
    - nodocker
  variables:
    # Fetch submodules (https://docs.gitlab.com/ee/ci/git_submodules.html#use-git-submodules-in-cicd-jobs).
+    GIT_STRATEGY: clone
+    GIT_DEPTH: 0
    GIT_SUBMODULE_STRATEGY: normal
    GIT_SUBMODULE_DEPTH: 1
    EDL_CI_SYN_OUTPUT_DIR: $CI_PROJECT_DIR/$EDL_CI_EOS_OUTPUT_DIR/bitstreams
@@ -131,6 +133,10 @@ build-wr2rf:
    - mkdir -p $_BITSTREAM_DEST
    - cp wr2rf.tar.xz $_BITSTREAM_DEST/

+  after_script:
+    # Copy logs on failure
+    - if [ "$CI_JOB_STATUS" == 'failed' ]; then mkdir -p "$_BITSTREAM_DEST"; find "$PWD" -path "$_BITSTREAM_DEST" -prune -o -name '*.log' -exec cp -prv '{}' "$_BITSTREAM_DEST/" ';'; fi
+
  artifacts:
    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA-$CI_JOB_ID"
    when: always

--- a/ci-scripts/build-wr2rf.sh
+++ b/ci-scripts/build-wr2rf.sh
 #!/bin/bash

+set -e
+set -o pipefail
+
 LOG_FILE="$PWD"/build

 # Needs Vivado > 2019.1
@@ -22,5 +25,5 @@ make files.tcl  2>&1 | tee "${LOG_FILE}_make_files.log"
 vivado -mode tcl -source wr2rf_vme.tcl

 git describe >> wr2rf_ver.txt
-tar -cJf wr2rf.tar.xz *.rpt *.dcp *.bit *.bin wr2rf_ver.txt
+tar -cJf wr2rf.tar.xz *.rpt *.dcp *.bit wr2rf_ver.txt
 cp wr2rf.tar.xz ../../..