bld: migrate to latest common gitlab-ci

84ad790f · Dimitris Lampridis · cd847841 · 84ad790f · 84ad790f · 84ad790f
Commit 84ad790f authored Jun 07, 2023 by Dimitris Lampridis
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 56 deletions

.gitlab-ci.yml .gitlab-ci.yml +8 -19

Makefile Makefile +1 -2

.gitlab-ci.yml hdl/syn/.gitlab-ci.yml +5 -29

.gitlab-ci.yml tests/.gitlab-ci.yml +9 -6

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,8 +10,7 @@ variables:
 include:
  - project: 'be-cem-edl/evergreen/gitlab-ci'
    ref: master
-    file:
-      - 'edl-gitlab-ci.yml'
+    file: 'edl-gitlab-ci.yml'
  - local: 'hdl/syn/.gitlab-ci.yml'
  - local: 'hdl/testbench/.gitlab-ci.yml'
  - local: 'tests/.gitlab-ci.yml'
@@ -23,7 +22,13 @@ cppcheck:
  script:
    - make cppcheck

-build-centos-7:
+build-drivers-cc7:
+  interruptible: true
+  extends: .kernel_build_cc7
+  variables:
+    EDL_CI_KBUILD_PATHS: software/kernel
+
+build-software-cc7:
  interruptible: true
  stage: build
  image:
@@ -40,20 +45,6 @@ build-centos-7:
      - $_SW_DEST/*
      - tests/firmware/*/*.bin

-build-kernel:
-  interruptible: true
-  stage: build
-  allow_failure: true
-  image:
-    name: gitlab-registry.cern.ch/coht/common-containers/build-kernel:latest
-  parallel:
-    matrix:
-      - VERSION: [5.10.149, 5.15.74]
-  script:
-    - source /linux-versions.sh
-    - fetch $VERSION && prepare $VERSION && export KERNELSRC=$(linux $VERSION)
-    - make modules
-
 trtl-project-creator:
  interruptible: true
  stage: build
@@ -63,5 +54,3 @@ trtl-project-creator:
    - TRTL=$PWD make -C /tmp/trtl_project_test/software lib
    - TRTL=$PWD make -C /tmp/trtl_project_test/software tools
    # TODO add firmware (need riscv32-gcc)
-  dependencies:
-  - build-centos-7
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,7 @@ all:
 	$(MAKE) -C software

 release: TEMP_RELEASE_DIR := $(shell mktemp -d)
-release: include lib tools modules
-	@cd software/kernel && tar -czf $(TOP_DIR)/mockturtle-drivers-$(VERSION).tar.gz *.ko
+release:
 	$(MAKE) PREFIX=$(TEMP_RELEASE_DIR) -C software/include install
 	$(MAKE) PREFIX=$(TEMP_RELEASE_DIR) -C software/lib install
 	$(MAKE) PREFIX=$(TEMP_RELEASE_DIR) -C software/lib/PyMockTurtle install

--- a/hdl/syn/.gitlab-ci.yml
+++ b/hdl/syn/.gitlab-ci.yml
@@ -3,35 +3,11 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later

 fpga_synthesis:
+  extends: .synthesis-ise-14-7
  interruptible: true
-  stage: build
-  needs: []
-  tags:
-    - xilinx_ise
-    - "14.7"
-  variables:
-    _BITSTREAM_DEST: $CI_PROJECT_DIR/$EDL_CI_EOS_OUTPUT_DIR/bitstreams
+  allow_failure: true
  parallel:
    matrix:
-      - SYN_NAME:
-          - spec_mt_demo
-          - svec_mt_demo
-  script:
-    - git submodule init && git submodule update
-    - cd hdl/syn/"$SYN_NAME"/
-    - hdlmake
-    - make
-    - |
-      if [[ $(cat *.par | grep -c "All constraints were met") = 0 ]]
-      then
-        echo -e "\e[31mTiming errors detected in PAR report. Aborting...\e[0m"
-        exit 1
-      fi
-    - tar -cJf $SYN_NAME.tar.xz *.syr *.par *.twr *.bit *.bin
-    - mkdir -p $_BITSTREAM_DEST
-    - cp $SYN_NAME.tar.xz $_BITSTREAM_DEST
-  artifacts:
-    name: "$SYN_NAME-synthesis-$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
-    when: always
-    paths:
-      - $_BITSTREAM_DEST/*
+      - EDL_CI_SYN_SRC_PATH:
+        - hdl/syn/spec_mt_demo
+        - hdl/syn/svec_mt_demo
--- a/tests/.gitlab-ci.yml
+++ b/tests/.gitlab-ci.yml
@@ -11,16 +11,19 @@ test_on_hw:
          - svec
  needs:
    # unfortunately the $CARD variable cannot be expanded here
-    - "fpga_synthesis: [spec_mt_demo]"
-    - "fpga_synthesis: [svec_mt_demo]"
-    - "build-centos-7"
+    - "fpga_synthesis: [hdl/syn/spec_mt_demo]"
+    - "fpga_synthesis: [hdl/syn/svec_mt_demo]"
+    - "build-drivers-cc7"
+    - "build-software-cc7"
  tags:
    - fec-runner
    - card-$CARD
  variables:
    VID: "000010dc"
-    _BITSTREAM_DEST: $CI_PROJECT_DIR/$EDL_CI_EOS_OUTPUT_DIR/bitstreams
-    _SW_DEST: $CI_PROJECT_DIR/$EDL_CI_EOS_OUTPUT_DIR/software
+    _BASE_DEST: $CI_PROJECT_DIR/$EDL_CI_EOS_OUTPUT_DIR
+    _BITSTREAM_DEST: $_BASE_DEST/bitstreams
+    _SW_DEST: $_BASE_DEST/software
+    _DRV_DEST: $_BASE_DEST/driver
  rules:
    - if: $CARD == "spec"
      variables:
@@ -44,7 +47,7 @@ test_on_hw:
    - tar xvf $_SW_DEST/mockturtle-software-*.tar.gz -C $TMP_DIR/
    - mkdir -p $TMP_DIR/lib/modules
    - cp -r /usr/local/lib/modules/$(uname -r) $TMP_DIR/lib/modules
-    - tar xvf $_SW_DEST/mockturtle-drivers-*.tar.gz -C $TMP_DIR/lib/modules/$(uname -r)/extra/cern/
+    - cp -r $_DRV_DEST/lib/modules/$(uname -r) $TMP_DIR/lib/modules
    - export MODPROBE_ROOT=$TMP_DIR
    - depmod -b $MODPROBE_ROOT
    - export FIRMWARE_PATH=$TMP_DIR/bitstreams