L2SS-2032: Fix integration tests after jumppad consul removal

README.md

@@ -151,6 +151,7 @@ Next change the version in the following places:
 
 # Release Notes
 
+* 0.43.2 Fix jumppad integration test using custom nomad image that includes consul
 * 0.43.1 Fix rounding for the coarse delay and loss compensations.
 * 0.43.0 Use PyTango 10.0.0
 * 0.42.12 Calibration device now fetches the station's name from the StationManager

infra/dev/nomad/config/nomad/client.hcl

@@ -77,7 +77,9 @@ telemetry {
 }
 
 consul {
-  address              = "localhost:8500"
+  # address              = "192.168.76.2:8500"
+  # checks_use_advertise = true # Otherwise will fallback to bind_addr
+  addres               = "127.0.0.1:8500"
   server_service_name  = "nomad"
   client_service_name  = "nomad-client"
   auto_advertise       = true
@@ -86,7 +88,6 @@ consul {
 }
 
 advertise {
-
   http = "{{ GetInterfaceIP \"eth0\" }}"
   rpc  = "{{ GetInterfaceIP \"eth0\" }}"
   serf = "{{ GetInterfaceIP \"eth0\" }}"

infra/dev/nomad/nomad.hcl

 resource "network" "station" {
   subnet = "192.168.72.0/21"
 }
+
 resource "template" "consul_config" {
 
   source = <<-EOF
@@ -39,9 +40,10 @@ resource "template" "consul_config" {
   destination = "./tmp/consul.hcl"
 }
 
-
 resource "container" "consul" {
-  depends_on = ["resource.template.consul_config"]
+  depends_on = [
+    "resource.template.consul_config", "resource.network.station"
+  ]
   network {
     id         = resource.network.station.meta.id
     ip_address = "192.168.76.1"
@@ -54,6 +56,7 @@ resource "container" "consul" {
   command = [
     "consul",
     "agent",
+    "-dev",
     "-config-file=/consul/config/config.hcl"
   ]
 
@@ -82,17 +85,22 @@ resource "container" "consul" {
   privileged = false
 }
 
-
 resource "nomad_cluster" "station" {
-  depends_on    = ["resource.container.consul"]
+  depends_on    = [
+    "resource.container.consul",
+  ]
   client_nodes  = 1
   client_config = "./config/nomad/client.hcl"
   consul_config = "./config/nomad/consul.hcl"
   datacenter    = "stat"
 
+  image {
+    name = "git.astron.nl:5000/lofar2.0/jumppad-docker-files/nomad:latest"
+  }
+
   network {
     id = resource.network.station.meta.id
-    #ip_address = "192.168.76.250"
+    # ip_address = "192.168.76.3"
   }
   environment = {
     NO_PROXY = "astron.nl,control.lofar,10.0.0.0/8"

infra/jobs/station/tango.levant.nomad

@@ -104,11 +104,16 @@ job "tango" {
       }
 
       template {
+        wait {
+          min     = "30s"
+          max     = "300s"
+        }
+        error_on_missing_key = true
         data        = <<EOH
-{{ range service "tangodb" }}
+{{- range service "tangodb" }}
 MYSQL_HOST     = "{{ .Address }}"
 MYSQL_PORT     = "{{ .Port }}"
-{{ end }}
+{{- end }}
 EOH
         destination = "local/env.txt"
         env         = true

setup.sh

@@ -43,7 +43,7 @@ if dig @127.0.0.1 -p 8600 tango.service.consul +short > /dev/null; then
   TANGO_HOST=$(dig @127.0.0.1 -p 8600 tango.service.consul +short)
   export TANGO_HOST="$TANGO_HOST:$TANGO_PORT"
 else
-  export TANGO_HOST=$(hostname):10000
+  export TANGO_HOST="$(hostname):10000"
 fi
 
 echo "Using tango host $TANGO_HOST"

tangostationcontrol/VERSION

-0.43.1
+0.43.2