Merge branch 'L2SS-559-borky-gitlab' into 'master'

L2SS-559: Attempt to fix borky gitlab

Closes L2SS-559

See merge request !215

.gitlab-ci.yml

@@ -42,6 +42,11 @@ stages:
     - . bootstrap/etc/lofar20rc.sh || true
 ##    Allow docker image script to execute
 #    - chmod u+x $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh
+# This suffers from only refs changes not working as expected:
+# https://gitlab.com/gitlab-org/gitlab-foss/-/issues/55012
+# Therefore we have to add `only: refs: - merge_requests` to all jobs that are
+# only supposed to run on merge requests with file changes. However,
+# two pipelines will spawn instead of one of which one tagged with 'detached`.
 .base_docker_images_except:
   extends: .base_docker_images
   except:
@@ -62,6 +67,8 @@ docker_store_images_master_tag:
 docker_store_images_changes:
   extends: .base_docker_store_images
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/.env
   except:
@@ -101,6 +108,8 @@ docker_build_image_all:
 docker_build_image_elk:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/elk.yml
       - docker-compose/elk/*
@@ -112,6 +121,8 @@ docker_build_image_elk:
 docker_build_image_lofar_device_base:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/lofar-device-base.yml
       - docker-compose/lofar-device-base/*
@@ -121,27 +132,30 @@ docker_build_image_lofar_device_base:
 docker_build_image_prometheus:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/prometheus.yml
       - docker-compose/prometheus/*
-  except:
-    refs:
-      - tags
-      - master
   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 prometheus $tag
 docker_build_image_itango:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/itango.yml
+      - docker-compose/itango/*
   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 itango $tag
 docker_build_image_grafana:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/grafana.yml
       - docker-compose/grafana/*
@@ -151,6 +165,8 @@ docker_build_image_grafana:
 docker_build_image_jupyter:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/jupyter.yml
       - docker-compose/jupyter/*
@@ -160,6 +176,8 @@ docker_build_image_jupyter:
 docker_build_image_apsct_sim:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/aspct-sim.yml
       - docker-compose/pypcc-sim-base/*
@@ -169,6 +187,8 @@ docker_build_image_apsct_sim:
 docker_build_image_apspu_sim:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/apspu-sim.yml
       - docker-compose/pypcc-sim-base/*
@@ -178,6 +198,8 @@ docker_build_image_apspu_sim:
 docker_build_image_recv_sim:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/recv-sim.yml
       - docker-compose/pypcc-sim-base/*
@@ -187,6 +209,8 @@ docker_build_image_recv_sim:
 docker_build_image_sdptr_sim:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/sdptr-sim.yml
       - docker-compose/sdptr-sim/*
@@ -196,6 +220,8 @@ docker_build_image_sdptr_sim:
 docker_build_image_unb2_sim:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/unb2-sim.yml
       - docker-compose/pypcc-sim-base/*
@@ -205,6 +231,8 @@ docker_build_image_unb2_sim:
 docker_build_image_device_apsct:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/device-aspct.yml
       - docker-compose/lofar-device-base/*
@@ -214,6 +242,8 @@ docker_build_image_device_apsct:
 docker_build_image_device_apspu:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/device-apspu.yml
       - docker-compose/lofar-device-base/*
@@ -223,6 +253,8 @@ docker_build_image_device_apspu:
 docker_build_image_device_boot:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/device-boot.yml
       - docker-compose/lofar-device-base/*
@@ -232,6 +264,8 @@ docker_build_image_device_boot:
 docker_build_image_device_docker:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/device-docker.yml
       - docker-compose/lofar-device-base/*
@@ -241,6 +275,8 @@ docker_build_image_device_docker:
 docker_build_image_device_ovservation_control:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/device-observation_control.yml
       - docker-compose/lofar-device-base/*
@@ -250,6 +286,8 @@ docker_build_image_device_ovservation_control:
 docker_build_image_device_recv:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/device-recv.yml
       - docker-compose/lofar-device-base/*
@@ -259,6 +297,8 @@ docker_build_image_device_recv:
 docker_build_image_device_sdp:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/device-sdp.yml
       - docker-compose/lofar-device-base/*
@@ -268,6 +308,8 @@ docker_build_image_device_sdp:
 docker_build_image_device_sst:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/device-sst.yml
       - docker-compose/lofar-device-base/*
@@ -277,6 +319,8 @@ docker_build_image_device_sst:
 docker_build_image_device_unb2:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/device-unb2.yml
       - docker-compose/lofar-device-base/*
@@ -286,6 +330,8 @@ docker_build_image_device_unb2:
 docker_build_image_device_xst:
   extends: .base_docker_images_except
   only:
+    refs:
+      - merge_requests
     changes:
       - docker-compose/device-xst.yml
       - docker-compose/lofar-device-base/*

docker-compose/itango/Dockerfile

@@ -4,7 +4,8 @@ FROM ${SOURCE_IMAGE}
 RUN sudo apt-get -y update && \
     sudo apt-get -y upgrade && \
     sudo apt-get -y install apt-file apt-transport-https apt-utils aptitude && \
-    sudo aptitude -y install htop iftop iproute2 mc most net-tools tcpdump telnet tmux traceroute vim xterm git && \
+    sudo apt-get -y install htop iftop iproute2 mc most net-tools tcpdump && \
+    sudo apt-get -y install telnet tmux traceroute vim xterm git && \
     sudo aptitude clean && \
     sudo aptitude autoclean