From 8c2d6f770aa4d104d1c9493299c8cb230827c121 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 22 Sep 2021 10:27:16 +0200 Subject: [PATCH] ci: fix config --- .gitlab-ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a039e4247..027be6919 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,7 +87,7 @@ test:flake8: stage: test script: - flake8 python/ - image: ${DOCKER_IMAGE}/dev:${DOCKER_TAG} + image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG} tags: - docker needs: @@ -107,7 +107,7 @@ test:cppcheck: -I include -I common/include src/ lib/ tests/unit/ | tee cppcheck.log - image: ${DOCKER_IMAGE}/dev:${DOCKER_TAG} + image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG} tags: - docker needs: @@ -137,7 +137,6 @@ test:unit: test:integration: stage: test image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG} - allow_failure: true script: - mkdir -p build && cd build - cmake ${CMAKE_OPTS} .. @@ -207,12 +206,12 @@ pkg:docker: - DISTRO: debian ARCH: x86_64 TRIPLET: x86_64-linux-gnu - DOCKER_IMAGE: ${DOCKER_IMAGE}/debian + DOCKER_IMAGE: ${CI_REGISTRY_IMAGE}/debian - DISTRO: debian ARCH: armhf TRIPLET: arm-linux-gnueabihf DOCKER_FILE: packaging/docker/Dockerfile.debian-multiarch - DOCKER_IMAGE: ${DOCKER_IMAGE}/debian + DOCKER_IMAGE: ${CI_REGISTRY_IMAGE}/debian - DISTRO: debian ARCH: arm64 TRIPLET: aarch64-linux-gnu