Merge branch 'L2SS-1758' into 'master'

L2SS-1758: Copy grafana image so TAG= can be used

Closes L2SS-1758

See merge request !895

README.md

@@ -14,9 +14,6 @@ Station Control software related to Tango devices. \
 * [Installation](#installation)
     * [Prerequisites](#prerequisites)
 * [User documentation (ReadTheDocs (Sphinx / ReStructuredText))](tangostationcontrol/docs/README.md)
-* [Docker compose & station services documentation](docker-compose/README.md)
-    * [Jupyter startup files](docker-compose/jupyterlab/ipython-profiles/stationcontrol-jupyter/startup/README.md)
-    * [Tango Prometheus exporter](https://git.astron.nl/lofar2.0/ska-tango-grafana-exporter)
 * [Developer Documentation](#development)
     * [Deployments](deploy/README.md)
     * [Versioning](#versioning)

infra/dev/nomad/nomad.hcl

@@ -116,6 +116,9 @@ resource "nomad_cluster" "station" {
   copy_image {
     name = "git.astron.nl:5000/lofar2.0/tango/lofar-device-base:${variable.image_tag}"
   }
+  copy_image {
+    name = "git.astron.nl:5000/lofar2.0/tango/grafana:${variable.image_tag}"
+  }
 }
 
 resource "exec" "enable_oversubscription" {

sbin/run_integration_test.sh

@@ -52,7 +52,7 @@ while true; do
       exit 0
       ;;
     --no-build)
-      echo "Disable docker compose build step"
+      echo "Disable docker build step"
       export no_build=1
       export NO_BUILD=${no_build}
       ;;
@@ -108,8 +108,14 @@ if [ -z "${no_build+x}" ]; then
     cd "${LOFAR20_DIR}/tangostationcontrol" || exit 1
     tox -e build
     cd "$LOFAR20_DIR/docker" || exit 1
-    make ec-sim lofar-device-base dsconfig integration-test
+    make ec-sim lofar-device-base dsconfig grafana integration-test
     cd "$LOFAR20_DIR"
+else
+  docker pull -q "git.astron.nl:5000/lofar2.0/tango/grafana:${TAG}" || docker pull -q "git.astron.nl:5000/lofar2.0/tango/grafana:latest"
+  if [ -z "$(docker images -q git.astron.nl:5000/lofar2.0/tango/grafana:${TAG} 2> /dev/null)" ]; then
+    echo "Tagging Grafana latest as ${TAG} for nomad copy_image task"
+    docker tag git.astron.nl:5000/lofar2.0/tango/grafana:latest git.astron.nl:5000/lofar2.0/tango/grafana:${TAG}
+  fi
 fi
 
 docker network rm station || true

sbin/tag_and_push_docker_image.sh

@@ -104,7 +104,7 @@ LOCAL_IMAGES=(
   "dsconfig dsconfig y"
 
   "ec-sim ec-sim y"
-  "grafana grafana n"
+  "grafana grafana y"
   "jupyter-lab jupyter-lab n"
   "integration-test integration-test n"
   "snmp-exporter snmp-exporter n"