Skip to content
Snippets Groups Projects
Commit 638a722c authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Merge branch 'ci' into 'master'

CI: Improve testing, JUnit output

See merge request sw/simox/simox!151
parents 53ea3d3a def3e9cd
No related branches found
No related tags found
No related merge requests found
...@@ -62,11 +62,7 @@ stages: ...@@ -62,11 +62,7 @@ stages:
# Test. # Test.
# ToDo: Add and use `axii ws test -m simox` # ToDo: Add and use `axii ws test -m simox`
- cd "$PROJECT_PATH_IN_WORKSPACE/build" - cd "$PROJECT_PATH_IN_WORKSPACE/build"
- ctest . || true - ctest --output-on-failure --output-junit "$CI_PROJECT_DIR/report.xml" .
- ctest --rerun-failed --output-on-failure . || true
- cat Testing/Temporary/LastTest.log || true
# Once again to make the job fail if an error occurs.
- ctest .
# Generate documentation. # Generate documentation.
- cd "$PROJECT_PATH_IN_WORKSPACE/build" - cd "$PROJECT_PATH_IN_WORKSPACE/build"
...@@ -82,6 +78,9 @@ build-and-test-bionic: ...@@ -82,6 +78,9 @@ build-and-test-bionic:
image: git.h2t.iar.kit.edu:5050/sw/armarx/meta/axii:latest-bionic image: git.h2t.iar.kit.edu:5050/sw/armarx/meta/axii:latest-bionic
artifacts: artifacts:
reports:
junit: report.xml
name: "Simox-Documentation-$CI_COMMIT_REF_NAME" name: "Simox-Documentation-$CI_COMMIT_REF_NAME"
paths: paths:
- build/doc/html/ - build/doc/html/
......
...@@ -2,10 +2,6 @@ FROM git.h2t.iar.kit.edu:5050/sw/armarx/meta/axii:latest-bionic ...@@ -2,10 +2,6 @@ FROM git.h2t.iar.kit.edu:5050/sw/armarx/meta/axii:latest-bionic
# Setup environment. # Setup environment.
SHELL ["/bin/bash", "-c"] SHELL ["/bin/bash", "-c"]
ENV LC_ALL C.UTF-8
ENV LANG C.UTF-8
ENV DEBIAN_FRONTEND noninteractive
ENV TZ Europe/Berlin
# Setup apt environment. # Setup apt environment.
RUN apt-get -qq update RUN apt-get -qq update
......
...@@ -2,10 +2,6 @@ FROM git.h2t.iar.kit.edu:5050/sw/armarx/meta/axii:latest-jammy ...@@ -2,10 +2,6 @@ FROM git.h2t.iar.kit.edu:5050/sw/armarx/meta/axii:latest-jammy
# Setup environment. # Setup environment.
SHELL ["/bin/bash", "-c"] SHELL ["/bin/bash", "-c"]
ENV LC_ALL C.UTF-8
ENV LANG C.UTF-8
ENV DEBIAN_FRONTEND noninteractive
ENV TZ Europe/Berlin
# Setup apt environment. # Setup apt environment.
RUN apt-get -qq update RUN apt-get -qq update
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment