L2SS-822: update scripts

.gitlab-ci.yml

@@ -112,6 +112,7 @@ docker_build_image_all:
     - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-xst latest
     - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-temperature-manager latest
     - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh archiver-timescale latest
+    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh hdbpp latest
     - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh hdbppts-cm latest
     - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh hdbppts-es latest
 docker_build_image_elk:
@@ -479,6 +480,17 @@ docker_build_image_archiver_timescale:
   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 archiver-timescale $tag
+docker_build_image_hdbpp:
+  extends: .base_docker_images_except
+  only:
+    refs:
+      - merge_requests
+    changes:
+      - docker-compose/archiver-timescale.yml
+      - docker-compose/hdbpp/*
+  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 hdbppts-cm $tag
 docker_build_image_hdbppts_cm:
   extends: .base_docker_images_except
   only:
@@ -486,7 +498,7 @@ docker_build_image_hdbppts_cm:
       - merge_requests
     changes:
       - docker-compose/archiver-timescale.yml
-      - docker-compose/tango-archiver-ts/*
+      - docker-compose/hdbppts-cm/*
   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 hdbppts-cm $tag
@@ -497,7 +509,7 @@ docker_build_image_hdbppts_es:
       - merge_requests
     changes:
       - docker-compose/archiver-timescale.yml
-      - docker-compose/tango-archiver-ts/*
+      - docker-compose/hdbppts-es/*
   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 hdbppts-es $tag

sbin/run_integration_test.sh

@@ -84,7 +84,7 @@ 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
-make build archiver-timescale hdbppts-cm hdbppts-es
+make build archiver-timescale hdbpp hdbppts-cm hdbppts-es
 
 # Start and stop sequence
 # shellcheck disable=SC2086
@@ -131,4 +131,4 @@ integration_test default
 
 integration_test recv_cluster "device-recv device-tilebeam device-antennafield" "${LOFAR20_DIR}/CDB/integrations/recvcluster_ConfigDb.json"
 
-integration_test observations "archiver-timescale hdbppts-cm hdbppts-es" "${LOFAR20_DIR}/CDB/integrations/multiobs_ConfigDb.json"
+integration_test observations "archiver-timescale hdbpp hdbppts-cm hdbppts-es" "${LOFAR20_DIR}/CDB/integrations/multiobs_ConfigDb.json"

sbin/tag_and_push_docker_image.sh

@@ -82,7 +82,7 @@ LOCAL_IMAGES=(
 
   "itango docker-compose_itango y"
 
-  "archiver-timescale timescaledb y" "hdbppts-cm hdbppts-cm y"
+  "archiver-timescale timescaledb y" "hdbpp hdbpp y" "hdbppts-cm hdbppts-cm y"
   "hdbppts-es hdbppts-es y"
 
   "grafana grafana n" "prometheus prometheus n"