From 1207cb5af6b7e76d9f721aca298ca4cc07e214ef Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Wed, 18 Oct 2023 15:45:29 +0200
Subject: [PATCH] Use docker image generated by ArmarXCore for CI
---
.gitlab-ci.yml | 23 ++++-------------------
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index efd3f2ad..a371fca5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,3 @@
-
stages:
- build-and-test
@@ -28,18 +27,12 @@ stages:
- ccache --max-size=20G
- ccache --show-stats
- # Ice configuration to run in Docker.
- - export ICE_DEFAULT_HOST="127.0.0.1"
- - export ICE_RUN_AS_ROOT="true"
-
# Activate Axii.
- source /axii/scripts/install_axii.sh
+ - _axii_auto_env_refresh
script:
- # Create workspace.
- - axii workspace create ~/workspace workspace
- - axii workspace activate workspace
- - _axii_auto_env_refresh
+ - echo "ArmarX Workspace = '$ARMARX_WORKSPACE'"
# Use workspace configuration from project.
- cp "$CI_PROJECT_DIR/.gitlab/ci/armarx-workspace.json" "$ARMARX_WORKSPACE/armarx-workspace.json"
@@ -67,14 +60,6 @@ stages:
- ccache --show-stats
- # Try starting Ice.
- - armarx switch docker_test --ice-host 127.0.0.1 --ice-port 10000 --ice-default-host 127.0.0.1 --mongo-host 127.0.0.1 --mongo-port 10001
- - armarx profile
- - armarx status || true
- #- armarx start
- # armarx status
- #- armarx stop
-
# Test.
# ToDo: Add and use `axii ws test -m "$PROJECT_MODULE"`
- cd "$PROJECT_PATH_IN_WORKSPACE/build"
@@ -89,11 +74,11 @@ build-and-test-bionic:
stage: build-and-test
extends: .build-and-test
- image: git.h2t.iar.kit.edu:5050/sw/armarx/meta/axii:latest-bionic
+ image: git.h2t.iar.kit.edu:5050/sw/armarx/armarx-core:latest-bionic
build-and-test-jammy:
stage: build-and-test
extends: .build-and-test
- image: git.h2t.iar.kit.edu:5050/sw/armarx/meta/axii:latest-jammy
+ image: git.h2t.iar.kit.edu:5050/sw/armarx/armarx-core:latest-jammy
--
GitLab