Merge branch 'master' into L2SS-921-antenna-names

.gitlab-ci.yml

@@ -529,6 +529,7 @@ unit_test:
       - tangostationcontrol/.coverage
 integration_test_docker:
   stage: integration-tests
+  allow_failure: true
   image: docker:latest
   tags:
     - privileged
@@ -551,6 +552,7 @@ integration_test_docker:
         tag="$CI_COMMIT_REF_SLUG"
         echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
       fi
+    - apk update
     - apk add --update make bash docker-compose
     - apk add --update bind-tools
     - apk add --update postgresql14-client gzip

docker-compose/Makefile

@@ -150,7 +150,8 @@ DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) \
     CONTAINER_NAME_PREFIX=$(CONTAINER_NAME_PREFIX) \
     COMPOSE_IGNORE_ORPHANS=true \
     CONTAINER_EXECUTION_UID=$(shell id -u) \
-    DOCKER_GID=$(DOCKER_GID)
+    DOCKER_GID=$(DOCKER_GID) \
+    TEST_MODULE=$(INTEGRATION_MODULE)
 
 
 .PHONY: up down minimal context run integration start stop restart build build-nocache status clean pull help
@@ -174,7 +175,7 @@ run: minimal  ## run a service using arguments and delete it afterwards
 	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) run --no-deps --rm $(SERVICE) $(SERVICE_ARGS)
 
 integration: minimal  ## run a service using arguments and delete it afterwards
-	TEST_MODULE=$(INTEGRATION_MODULE) $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) run --no-deps --rm integration-test $(INTEGRATION_ARGS)
+	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) run --no-deps --rm integration-test $(INTEGRATION_ARGS)
 
 down:  ## stop all services and tear down the system
 	$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) down

sbin/run_integration_test.sh

@@ -24,12 +24,16 @@ function integration_test {
   IFS=" " read -r -a restarts <<< "${2}"
   IFS=" " read -r -a configs <<< "${3}"
   for config in "${configs[@]}"; do
+    echo "Updating config ${config} ..."
     bash "${LOFAR20_DIR}"/sbin/update_ConfigDb.sh "${config}"
   done
   if [ ! -z "${2+x}" ]; then
+    # shellcheck disable=SC2145
+    echo "make restart ${restarts[@]} ..."
     make restart "${restarts[@]}"
   fi
   sleep 5
+  echo "make integration ${1} ..."
   make integration "${1}"
 }
 

tangostationcontrol/requirements.txt

@@ -2,7 +2,7 @@
 # order of appearance. Changing the order has an impact on the overall
 # integration process, which may cause wedges in the gate later.
 
-lofar-station-client@git+https://git.astron.nl/lofar2.0/lofar-station-client@0.4.0
+lofar-station-client@git+https://git.astron.nl/lofar2.0/lofar-station-client@0.6.0
 asyncua >= 0.9.90 # LGPLv3
 PyMySQL[rsa] >= 1.0.2 # MIT
 psycopg2-binary >= 2.9.2 # LGPL

tangostationcontrol/tox.ini

@@ -29,12 +29,14 @@ commands = {envpython} -m stestr run {posargs}
 [testenv:integration]
 ; Warning running integration tests will make changes to your docker system!
 ; These tests should only be run by the integration-test docker container.
+allowlist_externals = echo
 passenv = TANGO_HOST
 setenv =
     VIRTUAL_ENV={envdir}
     TESTS_DIR=./tangostationcontrol/integration_test/{env:TEST_MODULE:default}
     PYTHON={envpython} -m coverage run --source tangostationcontrol --parallel-mode
 commands =
+    echo "Integration test directory configured for{env:TESTS_DIR} ({env:TEST_MODULE})"
     {envpython} -m stestr run --serial {posargs}
     {envpython} -m coverage combine
     {envpython} -m coverage html --omit='*test*' -d cover