From cfe995cd85e8cccd8897d9a142220eb18c178555 Mon Sep 17 00:00:00 2001 From: Jan David Mol <mol@astron.nl> Date: Thu, 1 May 2025 05:53:20 +0200 Subject: [PATCH] fix --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c615b3f76..8f16f8d14 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -442,16 +442,17 @@ docker_build: - docker/snmp-exporter/snmp.yml docker_build_device_base: - extends: .base_docker_images + extends: + - .base_docker_store_images + - .local_job rules: + - !reference [.local_job, rules] - if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) || $CI_COMMIT_TAG script: # Do not remove 'bash' or statement will be ignored by primitive docker shell - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh lofar-device-base $tag - - .run_integration_tests: allow_failure: true stage: integration -- GitLab