L2SS-1052: remove further elk entries

.gitlab-ci.yml

@@ -88,8 +88,6 @@ docker_build_image_all:
     - 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 elk latest
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh elk-configure-host latest
     - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh lofar-device-base latest
     - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh prometheus latest
     - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh itango latest
@@ -140,19 +138,6 @@ docker_build_image_lofar_device_base:
   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
-docker_build_image_elk:
-  extends: .base_docker_images_except
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - docker-compose/elk.yml
-      - docker-compose/elk/*
-      - docker-compose/elk-configure-host/*
-  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 elk $tag
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh elk-configure-host $tag
 docker_build_image_prometheus:
   extends: .base_docker_images_except
   only:

sbin/run_integration_test.sh

@@ -86,7 +86,6 @@ SIMULATORS=(sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim ccd-sim)
 
 # shellcheck disable=SC2086
 make build "${DEVICES[@]}" "${SIMULATORS[@]}"
-# make build elk integration-test   # L2SS-970: elk temporarily disabled
 make build logstash integration-test schemas
 make build archiver-timescale hdbppts-cm hdbppts-es
 
@@ -95,7 +94,6 @@ make build archiver-timescale hdbppts-cm hdbppts-es
 make stop schemas
 make stop "${DEVICES[@]}" "${SIMULATORS[@]}" hdbppts-es hdbppts-cm archiver-timescale
 make stop device-docker # this one does not test well in docker-in-docker
-# make stop elk  # L2SS-970: elk temporarily disabled
 make stop logstash schemas
 
 # Run dummy integration test to install pytango in tox virtualenv without
@@ -106,7 +104,6 @@ make stop logstash schemas
 # TODO(L2SS-992): Remove me and above documentation
 integration_test dummy
 
-# make start elk # L2SS-970: elk temporarily disabled
 make start logstash schemas
 
 # Update the dsconfig

sbin/tag_and_push_docker_image.sh

@@ -60,7 +60,6 @@ REMOTE_IMAGES=(
 # integration tests.
 # TODO(Corne): Have this list generated from the .yml files
 LOCAL_IMAGES=(
-  "elk elk y" "elk-configure-host elk-configure-host y"
   "logstash logstash y"
   "lofar-device-base lofar-device-base y"