diff --git a/.gitlab/ci/_global.gitlab-ci.yml b/.gitlab/ci/_global.gitlab-ci.yml index 76df495049e2c4657d3328dc4d270329c7ecf9e2..6f34fe701df035e68ce49825fde0ff88449a9637 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 b081800c9965db39ccca440cf8fe73f6afb8db81..0fa0ba2e32f665e04df88cda5a5fcc90b3fd3f9b 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 d125e31b68d2bd5750b947ff5943fdda80345857..baffc551574df280467b2aebab25eb0d7dcb84b0 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