From 796371a6f251118c455fc49f69b866e5005a9c66 Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Mon, 10 Jul 2023 09:32:31 +0200
Subject: [PATCH] put back the test stage and dont allow failure
---
.gitlab-ci.yml | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b747d9927..d6167b439 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
stages:
- check
- # - test
+ - test
- automated_test
.before_script: &before_script
@@ -38,19 +38,19 @@ checks:
# Pass list of modified files to pre-commit so that it only checks them
- echo $FILES | xargs pre-commit run --color=always --files
-# pytest:
-# stage: test
-# only: [merge_requests]
-# <<: *before_script
-# script:
-# - export LANG=C # Hopefully detect anything relying on locale
-# - python3 -m pip install ".[test]"
-# - python3 -m pytest --color yes --verbose --cov=cal_tools --cov=xfel_calibrate
-# # Nope... https://docs.gitlab.com/12.10/ee/user/project/merge_requests/test_coverage_visualization.html#enabling-the-feature
-# # - coverage xml
-# # artifacts:
-# # reports:
-# # cobertura: coverage.xml
+pytest:
+ stage: test
+ only: [merge_requests]
+ <<: *before_script
+ script:
+ - export LANG=C # Hopefully detect anything relying on locale
+ - python3 -m pip install ".[test]"
+ - python3 -m pytest --color yes --verbose --cov=cal_tools --cov=xfel_calibrate
+ # Nope... https://docs.gitlab.com/12.10/ee/user/project/merge_requests/test_coverage_visualization.html#enabling-the-feature
+ # - coverage xml
+ # artifacts:
+ # reports:
+ # cobertura: coverage.xml
automated_test:
variables:
@@ -61,7 +61,7 @@ automated_test:
stage: automated_test
only: [merge_requests]
when: manual
- # allow_failure: true
+ allow_failure: false
<<: *before_script
script:
- export LANG=C # Hopefully detect anything relying on locale
--
GitLab