From 96f81d6fba029153f1450dfeca75ee416ddb8570 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Wed, 30 Jun 2021 17:25:44 +0200
Subject: [PATCH] Small clean ups in CI file. Use docker image with specific
ubuntu version.
---
.gitlab-ci.yml | 49 +++++++++++++++++++++++++++++++++++--------------
1 file changed, 35 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d3669b49..3109ac2d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,7 @@
-image: irmb/virtualfluids-python-deps:latest
+###############################################################################
+## VirtualFluids CI Pipeline ##
+###############################################################################
+image: irmb/virtualfluids-python-deps-ubuntu20.04:latest
stages:
- build
@@ -118,6 +121,8 @@ msvc_16:
gcc_9_python:
stage: build_python
+ image: irmb/virtualfluids-python-deps-ubuntu20.04:latest
+
needs: ["gcc_9"]
cache:
@@ -144,6 +149,8 @@ gcc_9_python:
build_singularity_image:
stage: container_upload
+ image: irmb/virtualfluids-python-deps-ubuntu20.04:latest
+
needs:
- gcc_9_python
@@ -164,6 +171,8 @@ build_singularity_image:
gcc_9_unit_tests:
stage: test
+ image: irmb/virtualfluids-deps-ubuntu20.04:latest
+
needs: ["gcc_9"]
before_script:
@@ -194,6 +203,8 @@ msvc_16_unit_tests:
gcc_9_python_bindings_test:
stage: test
+ image: irmb/virtualfluids-python-deps-ubuntu20.04:latest
+
needs: ["gcc_9_python"]
before_script:
@@ -209,6 +220,8 @@ gcc_9_python_bindings_test:
gcc_9_python_slurm_test:
stage: test
+ image: irmb/virtualfluids-python-deps-ubuntu20.04:latest
+
needs: ["gcc_9_python"]
rules:
@@ -252,14 +265,14 @@ gcc_9_python_slurm_test:
nvidia_test:
stage: benchmark
+ image: nvidia/cuda:11.1.1-devel-ubuntu20.04
+
needs: []
tags:
- gpu
- linux
- image: nvidia/cuda:11.1.1-devel-ubuntu20.04
-
script:
- echo NVIDIA_VISIBLE_DEVICES=${NVIDIA_VISIBLE_DEVICES}
- nvidia-smi
@@ -381,11 +394,11 @@ include_what_you_use_clang_10:
cppcheck:
stage: analyze
+ image: irmb/virtualfluids-deps-ubuntu20.04
+
only:
- develop@irmb/VirtualFluids_dev
- image: irmb/virtualfluids-deps-ubuntu20.04
-
needs: []
before_script:
@@ -409,11 +422,11 @@ cppcheck:
lizard:
stage: analyze
+ image: irmb/virtualfluids-python-deps-ubuntu20.04:latest
+
only:
- develop@irmb/VirtualFluids_dev
- image: irmb/virtualfluids-python-deps-ubuntu20.04
-
needs: []
before_script:
@@ -437,11 +450,11 @@ lizard:
gcov_gcc_9:
stage: analyze
+ image: irmb/virtualfluids-python-deps-ubuntu20.04:latest
+
only:
- develop@irmb/VirtualFluids_dev
- image: irmb/virtualfluids-python-deps-ubuntu20.04
-
needs: []
before_script:
@@ -481,11 +494,11 @@ gcov_gcc_9:
clang-tidy:
stage: analyze
+ image: irmb/virtualfluids-python-deps-ubuntu20.04:latest
+
only:
- develop@irmb/VirtualFluids_dev
- image: irmb/virtualfluids-python-deps-ubuntu20.04
-
needs: []
allow_failure: true
@@ -516,13 +529,13 @@ clang-tidy:
doxygen:
stage: analyze
+ image: alpine
+
only:
- develop@irmb/VirtualFluids_dev
needs: []
- image: alpine
-
script:
- apk update && apk add doxygen
- doxygen docs/Doxyfile
@@ -541,6 +554,8 @@ doxygen:
.deploy_template:
stage: deploy
+ image: irmb/virtualfluids-python-deps-ubuntu20.04:latest
+
before_script:
- 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
- apt-get install -y rsync
@@ -601,6 +616,9 @@ vf_wheel_to_jupyterhub:
# This job only run on the development branch of the parent repository, not on forks!
sonar-scanner:
stage: deploy
+
+ image: irmb/virtualfluids-python-deps-ubuntu20.04:latest
+
tags:
- linux
@@ -633,9 +651,12 @@ sonar-scanner:
## Release ##
###############################################################################
create_release:
- image: registry.gitlab.com/gitlab-org/release-cli:latest
stage: release
+
+ image: registry.gitlab.com/gitlab-org/release-cli:latest
+
needs: ["build_singularity_image"]
+
rules:
- if: $CI_COMMIT_TAG
--
GitLab