Merge branch 'ci-use-common-ci' into 'master'

ci: build doc using commong ci See merge request be-cem-edl/fec/hardware-modules/svec!17

Merge branch 'ci-use-common-ci' into 'master'
ci: build doc using commong ci See merge request be-cem-edl/fec/hardware-modules/svec!17
79862ddf · Federico Vaga · 4f70d66c · ace529f3 · 79862ddf · 79862ddf
Commit 79862ddf authored Sep 28, 2023 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 22 deletions

.gitlab-ci.yml .gitlab-ci.yml +6 -21

Kbuild software/kernel/Kbuild +0 -1

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,29 +8,14 @@ include:
    file:
      - 'edl-gitlab-ci.yml'

-documentation:
-  stage: build
-  image:
-    name: gitlab-registry.cern.ch/coht/common-containers/documentation:latest
-  script:
-    - make -C doc html
-    - mkdir -p $EDL_CI_EOS_OUTPUT_DIR
-    - cp -a doc/_build/html/* $EDL_CI_EOS_OUTPUT_DIR
-  artifacts:
-    paths:
-      - $EDL_CI_EOS_OUTPUT_DIR
+variables:
+  EDL_CI_DOC_SRC_PATH: 'doc'
+  EDL_CI_DOC_DST_PATH: '$EDL_CI_EOS_OUTPUT_DIR/doc'

-.script_build_kernel_dep: &script_build_kernel_dep
-  - export FPGA_MGR=/opt/fpga-mgr
-  - git clone --depth 1 https://gitlab.cern.ch/fvaga/fpga-manager.git $FPGA_MGR
-  - make -C $FPGA_MGR all
-
-kernel_build_cc7:
-  extends: .kernel_build_cc7
+software_build:
+  extends: .build_fec_os_sw
  variables:
-    EDL_CI_KBUILD_PATHS: software/kernel
-  before_script:
-    - *script_build_kernel_dep
+    EDL_CI_SW_PATHS: software

 kernel_build_validation:
  extends: .kernel_build_validation

--- a/software/kernel/Kbuild
+++ b/software/kernel/Kbuild
@@ -40,7 +40,6 @@ endif

 KBUILD_EXTRA_SYMBOLS += $(VMEBRIDGE_ABS)/driver/Module.symvers
 KBUILD_EXTRA_SYMBOLS += $(FMC_ABS)/drivers/fmc/Module.symvers
-KBUILD_EXTRA_SYMBOLS += $(I2C_ABS)/drivers/i2c/busses/Module.symvers

 obj-m := svec-fmc-carrier.o