Re-enable all steps, add jammy dockerfile and step

.gitlab-ci.yml

@@ -86,8 +86,6 @@ build-and-test-bionic:
     paths:
       - build/doc/html/
 
-  rules:
-    - if: $CI_COMMIT_BRANCH != "ci"
 
 build-and-test-jammy:
   stage: build-and-test
@@ -95,13 +93,10 @@ build-and-test-jammy:
 
   image: git.h2t.iar.kit.edu:5050/sw/armarx/meta/axii:latest-jammy
 
-  rules:
-    - if: $CI_COMMIT_BRANCH != "ci"
-
 
 docker-bionic:
   stage: deploy
-  # needs: ["build-and-test-bionic"]
+  needs: ["build-and-test-bionic"]
   image:
     name: gcr.io/kaniko-project/executor:v1.9.0-debug
     entrypoint: [""]
@@ -110,29 +105,24 @@ docker-bionic:
       --context "${CI_PROJECT_DIR}"
       --dockerfile "${CI_PROJECT_DIR}/docker/bionic"
       --destination "${CI_REGISTRY_IMAGE}:latest-bionic"
-  rules:
-    - if: $CI_COMMIT_BRANCH != "ci"
-
-
-armarx-core:
-  stage: downstream
-
-  variables:
-    TODO_ENV_VARIABLE: "This variable will be available to the CI pipeline of ArmarXCore."
 
-  trigger:
-    project: sw/armarx/armarx-core
-    # This is optional, but we could tell ArmarX which Simox branch to use.
-    branch: master  
 
-  rules:
-    - if: $CI_COMMIT_BRANCH == "master"
+docker-jammy:
+  stage: deploy
+  needs: ["build-and-test-jammy"]
+  image:
+    name: gcr.io/kaniko-project/executor:v1.9.0-debug
+    entrypoint: [""]
+  script:
+    - /kaniko/executor
+      --context "${CI_PROJECT_DIR}"
+      --dockerfile "${CI_PROJECT_DIR}/docker/jammy"
+      --destination "${CI_REGISTRY_IMAGE}:latest-jammy"
 
 
 .test-docker-image-common:
 
   before_script:
-    # - source ~/.bashrc
     - source /axii/scripts/install_axii.sh
     - _axii_auto_env_refresh
 
@@ -140,27 +130,35 @@ armarx-core:
     - echo "ArmarX Workspace = '$ARMARX_WORKSPACE'"
     - printenv
 
-    # - axii workspace activate workspace  # No effect
-    # - echo "ArmarX Workspace = '$ARMARX_WORKSPACE'"
-    # - printenv
-
-    # - export ARMARX_WORKSPACE="/workspace"
-    # - echo "ArmarX Workspace = '$ARMARX_WORKSPACE'"
-    # - printenv
-
     - axii workspace list-modules
     - axii workspace list-modules --deps
     - axii workspace info
 
+    - echo "Simox directory = '$Simox_DIR'"
     - which RobotViewer
 
 
 test-docker-image-ci:
   stage: post-deploy-test
-  # needs: ["docker-bionic"]
+  needs: ["docker-bionic"]
   extends: .test-docker-image-common
 
   image: git.h2t.iar.kit.edu:5050/sw/simox/simox:latest-bionic
 
   rules:
     - if: $CI_COMMIT_BRANCH == "ci"
+
+
+armarx-core:
+  stage: downstream
+
+  variables:
+    TODO_ENV_VARIABLE: "This variable will be available to the CI pipeline of ArmarXCore."
+
+  trigger:
+    project: sw/armarx/armarx-core
+    # This is optional, but we could tell ArmarX which Simox branch to use.
+    branch: master
+
+  rules:
+    - if: $CI_COMMIT_BRANCH == "master"

docker/jammy

+FROM git.h2t.iar.kit.edu:5050/sw/armarx/meta/axii:latest-jammy
+
+# Setup environment.
+SHELL ["/bin/bash", "-c"]
+ENV LC_ALL C.UTF-8
+ENV LANG C.UTF-8
+ENV DEBIAN_FRONTEND noninteractive
+ENV TZ Europe/Berlin
+
+# Setup workspace in Docker.
+RUN axii workspace create /workspace workspace
+RUN axii workspace activate workspace
+
+# Simulate activating the workspace.
+ENV ARMARX_WORKSPACE=/workspace
+
+# Setup repo in Docker.
+WORKDIR $ARMARX_WORKSPACE/simox
+COPY --chmod=755 . .
+
+# Use workspace config.
+COPY docker/armarx-workspace.json $ARMARX_WORKSPACE/armarx-workspace.json
+
+# Run the upgrade.
+RUN axii workspace system --accept-apt-install
+# ToDo: Prevent this from updating Simox itself.
+RUN axii workspace update --prefer-https
+RUN axii workspace upgrade