Merge branch '17-update-ci-to-use-generic-edl-jobs' into 'master'

Resolve "Update CI to use generic EDL jobs" Closes #17 See merge request be-cem-edl/fec/hardware-modules/spec!6

Merge branch '17-update-ci-to-use-generic-edl-jobs' into 'master'
Resolve "Update CI to use generic EDL jobs" Closes #17 See merge request be-cem-edl/fec/hardware-modules/spec!6
8bea55ab · Federico Vaga · aee0dc19 · 5c58cfdd · 8bea55ab · 8bea55ab
Commit 8bea55ab authored Apr 11, 2023 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 66 deletions

.gitlab-ci.yml .gitlab-ci.yml +7 -26

requirements.txt doc/requirements.txt +2 -40

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,10 @@ include:
    file:
      - 'edl-gitlab-ci.yml'
+variables:
+  EDL_CI_DOC_SRC_PATH: 'doc'
+  EDL_CI_DOC_DST_PATH: '$EDL_CI_EOS_OUTPUT_DIR/doc'
 cppcheck:
  stage: analyse
  image:
@@ -15,18 +19,6 @@ cppcheck:
  script:
    - make -C software cppcheck
-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
 .script_fetch_kernel_dep: &script_fetch_kernel_dep
  - git clone --depth 1 https://gitlab.cern.ch/fvaga/fpga-manager.git ~/git/fpga-mgr
  - export FPGA_MGR=~/git/fpga-mgr
@@ -53,20 +45,9 @@ build-centos-7:
  script:
    - make -C software
-build-kernel:
+kernel_build_validation:
-  stage: build
+  extends: .kernel_build_validation
-  allow_failure: true
-  variables:
-    CONFIG_FPGA_MGR_BACKPORT: n
-  image:
-    name: gitlab-registry.cern.ch/coht/common-containers/build-kernel:latest
-  parallel:
-    matrix:
-      - VERSION: [5.10.149, 5.15.74]
  before_script:
+    - export CONFIG_FPGA_MGR_BACKPORT=n
    - *script_fetch_kernel_dep
-  script:
-    - source /linux-versions.sh
-    - fetch $VERSION && prepare $VERSION  && export KERNELSRC=$(linux $VERSION)
    - *script_build_kernel_dep
-    - make -C software/kernel all
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,43 +2,5 @@
 #
 # SPDX-License-Identifier: CC-BY-SA-4.0+
-alabaster==0.7.12
+Sphinx
-appdirs==1.4.3
+sphinx-rtd-theme
-Babel==2.8.0
-CacheControl==0.12.6
-certifi==2019.11.28
-chardet==3.0.4
-colorama==0.4.3
-contextlib2==0.6.0
-distlib==0.3.0
-distro==1.4.0
-docutils==0.16
-html5lib==1.0.1
-idna==2.8
-imagesize==1.2.0
-Jinja2==2.11.2
-lockfile==0.12.2
-MarkupSafe==1.1.1
-msgpack==0.6.2
-packaging==20.3
-pep517==0.8.2
-pkg-resources==0.0.0
-progress==1.5
-Pygments==2.6.1
-pyparsing==2.4.6
-pytoml==0.1.21
-pytz==2020.1
-requests==2.23.0
-retrying==1.3.3
-six==1.14.0
-snowballstemmer==2.0.0
-Sphinx==3.1.2
-sphinx-rtd-theme==0.5.0
-sphinxcontrib-applehelp==1.0.2
-sphinxcontrib-devhelp==1.0.2
-sphinxcontrib-htmlhelp==1.0.3
-sphinxcontrib-jsmath==1.0.1
-sphinxcontrib-qthelp==1.0.3
-sphinxcontrib-serializinghtml==1.1.4
-urllib3==1.25.8
-webencodings==0.5.1