From 9bb4e045758ce7b024434966e031a298bcbb8edb Mon Sep 17 00:00:00 2001
From: cmoineau <cyril.moineau@cea.fr>
Date: Mon, 7 Aug 2023 11:53:34 +0000
Subject: [PATCH] [GitLabCI] Update test.
---
.gitlab/ci/_global.gitlab-ci.yml | 3 +++
.gitlab/ci/build.gitlab-ci.yml | 4 ----
.gitlab/ci/test.gitlab-ci.yml | 4 +---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/.gitlab/ci/_global.gitlab-ci.yml b/.gitlab/ci/_global.gitlab-ci.yml
index 76df49504..6f34fe701 100644
--- a/.gitlab/ci/_global.gitlab-ci.yml
+++ b/.gitlab/ci/_global.gitlab-ci.yml
@@ -8,3 +8,6 @@ variables:
OMP_NUM_THREADS: 4
GIT_SSL_NO_VERIFY: 1
DEBIAN_FRONTEND: noninteractive
+
+
+image: n2d2-ci/ubuntu20.04/cpu:latest
\ No newline at end of file
diff --git a/.gitlab/ci/build.gitlab-ci.yml b/.gitlab/ci/build.gitlab-ci.yml
index b081800c9..0fa0ba2e3 100644
--- a/.gitlab/ci/build.gitlab-ci.yml
+++ b/.gitlab/ci/build.gitlab-ci.yml
@@ -2,8 +2,6 @@ build:ubuntu_cpp:
stage: build
tags:
- docker
- image: n2d2-ci/ubuntu20.04/cpu:latest
-
script:
- mkdir -p build_cpp
- mkdir -p install_cpp
@@ -20,8 +18,6 @@ build:ubuntu_python:
stage: build
tags:
- docker
- image: n2d2-ci/ubuntu20.04/cpu:latest
-
script:
- export AIDGE_INSTALL=`pwd`/install
- pip install . -v
diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml
index d125e31b6..baffc5515 100644
--- a/.gitlab/ci/test.gitlab-ci.yml
+++ b/.gitlab/ci/test.gitlab-ci.yml
@@ -3,9 +3,8 @@ test:ubuntu_cpp:
needs: ["build:ubuntu_cpp"]
tags:
- docker
- image: n2d2-ci/ubuntu20.04/cpu:latest
script:
- - cd build_test
+ - cd build_cpp
- ctest --output-on-failure
test:ubuntu_python:
@@ -13,7 +12,6 @@ test:ubuntu_python:
needs: ["build:ubuntu_python"]
tags:
- docker
- image: n2d2-ci/ubuntu20.04/cpu:latest
script:
- cd aidge_core
- python3 -m pip list
--
GitLab