bld: improve CI/CD

Use containers, and more building tests. Remove the koji and RPM part (we will work on that again in the future but now it does not work anymore) Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

bld: improve CI/CD
Use containers, and more building tests. Remove the koji and RPM part (we will work on that again in the future but now it does not work anymore) Signed-off-by: Federico Vaga <federico.vaga@cern.ch>
ee84b49e · Federico Vaga · 869e65b2 · ee84b49e
Commit ee84b49e authored Jul 02, 2021 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 48 additions and 44 deletions

.gitlab-ci.yml .gitlab-ci.yml +48 -44

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,20 +3,9 @@
 #
 # SPDX-License-Identifier: CC0-1.0

---
-variables:
-  KOJI_TARGET: 'ohwr7'
-  KOJI_DISTTAG: '.el7.cern'
-  DIST_PATH: distribution
-  BUILD_PATH: distribution/build
-
 stages:
  - static-analysis
  - build
-  - dkms
-  - srpm
-  - kscratch
-  - kbuild

 reuse:
  stage: static-analysis
@@ -28,47 +17,62 @@ reuse:

 cppcheck:
  stage: static-analysis
+  image:
+    name: gitlab-registry.cern.ch/coht/common-containers/static-analysis:latest
  script:
-    - yum install -y cppcheck
    - make -C software cppcheck

-build:
-  stage: build
-  script:
-    - yum install -y kernel-devel
-    - LINUX=/usr/src/kernels/*/ make -C software
+.script_fetch_kernel_dep: &script_fetch_kernel_dep
+  - git clone --depth 1 https://gitlab.cern.ch/coht/fmc.git ~/git/fmc
+  - export FMC=~/git/fmc

-build_dkms_rpm:
-  stage: dkms
-  script:
-    - yum install -y dkms
-    - make -C distribution dkms-rpm
+.script_build_kernel_dep: &script_build_kernel_dep
+  - make -C $FMC/drivers/fmc all

-build_srpm:
-  stage: srpm
+build-centos-7:
+  stage: build
+  variables:
+    LINUX: /usr/src/kernels/*/
+  image:
+    name: gitlab-registry.cern.ch/coht/common-containers/build-centos-7:latest
+  before_script:
+    - *script_fetch_kernel_dep
+    - *script_build_kernel_dep
  script:
-    - yum-builddep -y ${DIST_PATH}/*.spec
-    - LINUX=/usr/src/kernels/*/ make -C distribution srpm
-  artifacts:
-    paths:
-      - distribution/build/SRPMS/${CI_PROJECT_NAME}*src.rpm
-    expire_in: 1 day
+    - make -C software

-.koji_deps_template: &koji_deps
-  before_script:
-    - yum install -y koji krb5-workstation rpm-build
-    - echo ${OHWR_PASSWORD} | kinit ${OHWR_USER}
+.script_build_kernel_ver: &script_build_kernel_ver
+  - source /linux-versions.sh
+  - fetch $VERSION && prepare $VERSION && export LINUX=$(linux $VERSION)
+  - *script_build_kernel_dep
+  - make -C software/kernel all

-kscratch:
-  <<: *koji_deps
-  stage: kscratch
+build-kernel-5.4.129:
+  stage: build
+  allow_failure: true
+  variables:
+    VERSION: 5.4.129
+  image:
+    name: gitlab-registry.cern.ch/coht/common-containers/build-kernel:latest
+  before_script:
+    - *script_fetch_kernel_dep
  script:
-    - koji --config=.koji build --wait --scratch ${KOJI_TARGET} distribution/build/SRPMS/${CI_PROJECT_NAME}*src.rpm
+    - *script_build_kernel_ver

-kbuild-ohwr:
-  <<: *koji_deps
-  stage: kbuild
-  only:
-    - tags
+.script_build_kernel_ver: &script_build_kernel_ver
+  - source /linux-versions.sh
+  - fetch $VERSION && prepare $VERSION && export LINUX=$(linux $VERSION)
+  - *script_build_kernel_dep
+  - make -C software/kernel all
+
+build-kernel-5.10.47:
+  stage: build
+  allow_failure: true
+  variables:
+    VERSION: 5.10.47
+  image:
+    name: gitlab-registry.cern.ch/coht/common-containers/build-kernel:latest
+  before_script:
+    - *script_fetch_kernel_dep
  script:
-    - koji --config=.koji build --wait ${KOJI_TARGET} distribution/build/SRPMS/${CI_PROJECT_NAME}*src.rpm
+    - *script_build_kernel_ver