L2SS-1173: fix workaround

.gitlab-ci.yml

@@ -115,7 +115,6 @@ docker_build_image:
   parallel:
     matrix:
       - IMAGE:
-          # - lofar-device-base # L2SS-1173: temporary workaround to solve new device container issue
           - ec-sim
           - http-json-schemas
           - prometheus
@@ -136,6 +135,15 @@ docker_build_image:
     #    Do not remove 'bash' or statement will be ignored by primitive docker shell
     - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh $IMAGE $tag
 
+docker_build_image_device_base:
+  extends: .base_docker_images
+  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
+
 newline_at_eof:
   stage: linting
   before_script:

sbin/run_integration_test.sh

@@ -135,9 +135,6 @@ make start "${SIMULATORS[@]}"
 # Give the simulators time to start
 sleep 5
 
-# build base lofar device image
-## L2SS-1173: temporary workaround for building new device containers in a branch! ##
-make base
 # shellcheck disable=SC2086
 make start "${DEVICES[@]}"