From c51c90d5dca7b17e858bb3f81e818eb6d496a46e Mon Sep 17 00:00:00 2001 From: SylvanArnold <89144178+SylvanArnold@users.noreply.github.com> Date: Sun, 8 Jun 2025 22:06:20 +0200 Subject: [PATCH] CI(pico-sensor): included pipeline correctly in main gitlab ci yml file --- pico-sensor/.gitlab-ci.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pico-sensor/.gitlab-ci.yml b/pico-sensor/.gitlab-ci.yml index 70c32fc..070a761 100644 --- a/pico-sensor/.gitlab-ci.yml +++ b/pico-sensor/.gitlab-ci.yml @@ -1,28 +1,28 @@ variables: - DOCKER_IMAGE: registry.forge.hefr.ch/team-raclette/project-softweng/pico-sensor:latest + PICO_DOCKER_IMAGE: registry.forge.hefr.ch/team-raclette/project-softweng/pico-sensor:latest stages: - - build-docker - - test - - release + - pico-sensor-docker-build + - pico-sensor-test + - pico-sensor-release pico-sensor-docker-build: image: docker:latest - stage: build-docker + stage: pico-sensor-docker-build services: - docker:dind script: - - docker build -t $DOCKER_IMAGE -f pico-sensor/dockerfile . + - docker build -t $PICO_DOCKER_IMAGE -f pico-sensor/Dockerfile . - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY - - docker push $DOCKER_IMAGE + - docker push $PICO_DOCKER_IMAGE rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_COMMIT_BRANCH == 'main' - changes: - pico-sensor/Dockerfile pico-sensor-test: - stage: test - image: registry.forge.hefr.ch/team-raclette/project-softweng/pico-sensor:latest + stage: pico-sensor-test + image: $PICO_DOCKER_IMAGE variables: TUNNEL_ID: "801000372" # Tunnel ID to reach the pico-sensor device script: @@ -36,8 +36,8 @@ pico-sensor-test: - pico-sensor/build/Test/test-results.xml pico-sensor-release: - stage: release - image: $DOCKER_IMAGE + stage: pico-sensor-release + image: $PICO_DOCKER_IMAGE script: - cd pico-sensor - cmake --preset Release