Merge branch 'fix-integration-test' into 'master'

Fix integration test

See merge request !775

.gitlab-ci.yml

@@ -4,6 +4,8 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
   PIP_REQUIREMENTS_FILE: "tangostationcontrol/requirements.txt"
+  DOCKER_DRIVER: overlay2
+  DOCKER_TLS_CERTDIR: ""
 cache:
   key: $CI_COMMIT_REF_SLUG
   paths:
@@ -61,7 +63,6 @@ wheel_packaging:
   services:
     - name: docker:dind
   variables:
-    DOCKER_TLS_CERTDIR: "/certs"
     TANGO_SKIP_BUILD: "true"
   before_script:
     - |
@@ -278,8 +279,6 @@ unit_test:
   services:
     - name: docker:dind
   variables:
-    DOCKER_DRIVER: overlay2
-    DOCKER_TLS_CERTDIR: ""
     JUMPPAD_HOME: $CI_PROJECT_DIR
   before_script:
     - |

.prepare.gitlab-ci.yml

@@ -6,6 +6,9 @@ build_ci_runner_image:
   image: docker:stable
   services:
     - docker:dind
+  variables:
+    DOCKER_DRIVER: overlay2
+    DOCKER_TLS_CERTDIR: ""
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - |

sbin/run_integration_test.sh

@@ -143,7 +143,7 @@ fi
 
 rm -rf "$JUMPPAD_HOME/.jumppad/"
 
-HOME="$JUMPPAD_HOME" jumppad up --var="host_volume=$tmp_volume" infra/dev/main.hcl || true
+HOME="$JUMPPAD_HOME" jumppad up --var="host_volume=$tmp_volume" infra/dev/main.hcl
 
 echo -n "Waiting for tango service to become available .."
 until [[ $(dig @127.0.0.1 -p 8600 tango.service.consul +short) ]]; do

tangostationcontrol/tangostationcontrol/device_server/__init__.py

@@ -64,7 +64,7 @@ def main(**kwargs):
     configure_logger()
 
     if device_class_str == "ObservationControl":
-        classes = (device_class, devices.Observation)
+        classes = (device_class, devices.ObservationField)
     else:
         classes = (device_class,)