Skip to content
Snippets Groups Projects
Commit b91760ba authored by Jan David Mol's avatar Jan David Mol
Browse files

Merge branch 'Fix-Jupyter-Version-Number-and-add-rs311' into 'master'

Fix jupyter version number and add rs311

See merge request !1110
parents 26e764d9 06e56dbd
No related branches found
No related tags found
1 merge request!1110Fix jupyter version number and add rs311
Pipeline #120446 passed with warnings
Pipeline: tango

#120447

    ......@@ -84,7 +84,7 @@ run_shellcheck:
    variables:
    LOFAR1_STATIONS: cs002 cs003 cs004 cs005 cs006 cs007 cs011 cs013 cs017 cs021 cs024 cs026 cs028 cs030 cs031 cs101 cs103 cs201 cs301 cs302 cs401 cs501 rs106 rs205 rs208 rs210 rs305 rs306 rs310 rs406 rs407 rs409 rs503 rs508 rs509
    LOFAR2_STATIONS: cs001 cs032 rs307
    DEV_STATIONS: dts-lab
    DEV_STATIONS: dts-lab rs311
    # Repeat this list in .deploy.gitlab-ci.yml
    COMPONENTS: mesh-gateway monitoring logging tango object-storage object-replication sdptr device-server dsconfig ec-sim jupyter network-monitoring landing-page rpc-server
    ......@@ -187,7 +187,7 @@ render_ansible_hosts:
    echo " hosts:"
    ) > ${OUTPUT}
    for STATION in ${LOFAR2_STATIONS}; do
    for STATION in ${LOFAR1_STATIONS} ${LOFAR2_STATIONS}; do
    echo "Generating ansible host information for ${STATION}"
    CONTROL_VLAN=`jq < netbox-vlans.json '.results[] | select(.name == "'${STATION}'-control") | .vid' -r`
    ......@@ -738,6 +738,7 @@ deploy_manual:
    - cs001
    - cs032
    - rs307
    - rs311
    - dts-lab
    # Deploy on $STATION as set by a multi-project pipeline
    ......
    {
    "servers": {
    "Beamlet": {
    "STAT": {
    "Beamlet": {
    "STAT/Beamlet/LBA": {
    "properties": {
    "FPGA_beamlet_output_hdr_eth_source_mac_RW_default": [
    "00:22:86:6e:00:00",
    "00:22:86:6e:00:01",
    "00:22:86:6e:00:02",
    "00:22:86:6e:00:03",
    "00:22:86:6e:00:10",
    "00:22:86:6e:00:11",
    "00:22:86:6e:00:12",
    "00:22:86:6e:00:13",
    "00:22:86:6e:00:20",
    "00:22:86:6e:00:21",
    "00:22:86:6e:00:22",
    "00:22:86:6e:00:23",
    "00:22:86:6e:00:30",
    "00:22:86:6e:00:31",
    "00:22:86:6e:00:32",
    "00:22:86:6e:00:33"
    ],
    "FPGA_beamlet_output_hdr_ip_source_address_RW_default": [
    "145.124.143.138",
    "145.124.143.138",
    "145.124.143.138",
    "145.124.143.138",
    "145.124.143.138",
    "145.124.143.138",
    "145.124.143.138",
    "145.124.143.138",
    "145.124.143.138",
    "145.124.143.138",
    "145.124.143.138",
    "145.124.143.138",
    "145.124.143.138",
    "145.124.143.138",
    "145.124.143.138",
    "145.124.143.138"
    ],
    "FPGA_beamlet_output_hdr_udp_source_port_RW_default": [
    "50000",
    "50001",
    "50002",
    "50003",
    "50004",
    "50005",
    "50006",
    "50007",
    "50008",
    "50009",
    "50010",
    "50011",
    "50012",
    "50013",
    "50014",
    "50015"
    ],
    "FPGA_beamlet_output_multiple_hdr_eth_destination_mac_RW_default_shorthand": [
    "00:22:86:ff:07:01",
    "00:22:86:ff:07:02",
    "00:22:86:ff:07:03",
    "00:22:86:ff:07:04"
    ],
    "FPGA_beamlet_output_multiple_hdr_ip_destination_address_RW_default_shorthand": [
    "192.0.2.1",
    "192.0.2.2",
    "192.0.2.3",
    "192.0.2.4"
    ],
    "FPGA_beamlet_output_multiple_hdr_udp_destination_port_RW_default_shorthand": [
    "10000",
    "10001",
    "10002",
    "10003"
    ]
    }
    },
    "STAT/Beamlet/HBA": {
    "properties": {
    "FPGA_beamlet_output_hdr_eth_source_mac_RW_default": [
    "00:22:86:6e:01:00",
    "00:22:86:6e:01:01",
    "00:22:86:6e:01:02",
    "00:22:86:6e:01:03",
    "00:22:86:6e:01:10",
    "00:22:86:6e:01:11",
    "00:22:86:6e:01:12",
    "00:22:86:6e:01:13",
    "00:22:86:6e:01:20",
    "00:22:86:6e:01:21",
    "00:22:86:6e:01:22",
    "00:22:86:6e:01:23",
    "00:22:86:6e:01:30",
    "00:22:86:6e:01:31",
    "00:22:86:6e:01:32",
    "00:22:86:6e:01:33"
    ],
    "FPGA_beamlet_output_hdr_ip_source_address_RW_default": [
    "145.124.143.139",
    "145.124.143.139",
    "145.124.143.139",
    "145.124.143.139",
    "145.124.143.139",
    "145.124.143.139",
    "145.124.143.139",
    "145.124.143.139",
    "145.124.143.139",
    "145.124.143.139",
    "145.124.143.139",
    "145.124.143.139",
    "145.124.143.139",
    "145.124.143.139",
    "145.124.143.139",
    "145.124.143.139"
    ],
    "FPGA_beamlet_output_hdr_udp_source_port_RW_default": [
    "50000",
    "50001",
    "50002",
    "50003",
    "50004",
    "50005",
    "50006",
    "50007",
    "50008",
    "50009",
    "50010",
    "50011",
    "50012",
    "50013",
    "50014",
    "50015"
    ],
    "FPGA_beamlet_output_multiple_hdr_eth_destination_mac_RW_default_shorthand": [
    "00:22:86:ff:07:21",
    "00:22:86:ff:07:22",
    "00:22:86:ff:07:23",
    "00:22:86:ff:07:24"
    ],
    "FPGA_beamlet_output_multiple_hdr_ip_destination_address_RW_default_shorthand": [
    "192.0.2.33",
    "192.0.2.34",
    "192.0.2.35",
    "192.0.2.36"
    ],
    "FPGA_beamlet_output_multiple_hdr_udp_destination_port_RW_default_shorthand": [
    "10100",
    "10101",
    "10102",
    "10103"
    ]
    }
    }
    }
    }
    }
    }
    }
    {
    "servers": {
    "StationManager": {
    "STAT": {
    "StationManager": {
    "STAT/StationManager/1": {
    "properties": {
    "Station_Name": [
    "RS311"
    ],
    "Station_Number": [
    "311"
    ]
    }
    }
    }
    }
    },
    "AFL": {
    "STAT": {
    "AFL": {
    "STAT/AFL/LBA": {
    "properties": {
    "Antenna_Cables": [
    "80m", "80m", "80m", "80m", "80m", "80m",
    "80m", "80m", "80m", "80m", "80m", "80m",
    "80m", "115m", "80m", "80m", "80m", "80m",
    "80m", "80m", "80m", "80m", "80m", "80m",
    "80m", "115m", "115m", "80m", "80m", "80m",
    "80m", "80m", "80m", "80m", "80m", "80m",
    "80m", "80m", "80m", "80m", "80m", "115m",
    "115m", "115m", "80m", "80m", "115m", "50m",
    "80m", "80m", "80m", "80m", "80m", "80m",
    "80m", "80m", "115m", "115m", "115m", "115m",
    "80m", "80m", "80m", "80m", "50m", "50m",
    "50m", "80m", "115m", "115m", "115m", "115m",
    "115m", "80m", "80m", "80m", "50m", "50m",
    "50m", "50m", "80m", "80m", "115m", "115m",
    "115m", "115m", "115m", "115m", "115m", "80m",
    "50m", "50m", "50m", "80m", "115m", "115m"
    ],
    "Antenna_Field_Reference_ITRF": [
    "3837940.905", "449560.803", "5057381.316"
    ],
    "Antenna_Reference_ETRS": [
    "3837941.343", "449560.431", "5057381.027",
    "3837939.324", "449560.188", "5057382.565",
    "3837940.005", "449562.536", "5057381.841",
    "3837942.143", "449562.794", "5057380.213",
    "3837943.362", "449560.674", "5057379.489",
    "3837942.681", "449558.326", "5057380.213",
    "3837940.543", "449558.068", "5057381.841",
    "3837937.080", "449563.014", "5057383.994",
    "3837939.264", "449565.736", "5057382.108",
    "3837942.421", "449565.978", "5057379.717",
    "3837945.073", "449563.623", "5057377.939",
    "3837945.980", "449559.775", "5057377.606",
    "3837944.718", "449556.235", "5057378.873",
    "3837941.876", "449554.657", "5057381.149",
    "3837938.785", "449555.782", "5057383.367",
    "3837936.891", "449559.082", "5057384.491",
    "3837934.025", "449559.061", "5057386.644",
    "3837933.549", "449562.687", "5057386.673",
    "3837934.907", "449567.322", "5057385.236",
    "3837940.024", "449570.443", "5057381.112",
    "3837942.610", "449570.346", "5057379.180",
    "3837945.794", "449568.518", "5057376.955",
    "3837947.644", "449564.829", "5057375.900",
    "3837948.506", "449559.101", "5057375.770",
    "3837947.907", "449554.435", "5057376.642",
    "3837945.439", "449551.495", "5057378.760",
    "3837942.309", "449551.169", "5057381.139",
    "3837938.495", "449552.340", "5057383.896",
    "3837935.474", "449555.278", "5057385.898",
    "3837929.915", "449559.701", "5057389.671",
    "3837929.643", "449563.507", "5057389.531",
    "3837930.762", "449566.215", "5057388.446",
    "3837935.255", "449571.582", "5057384.589",
    "3837936.054", "449574.340", "5057383.740",
    "3837942.048", "449573.619", "5057379.306",
    "3837945.935", "449571.870", "5057376.546",
    "3837950.059", "449570.291", "5057373.593",
    "3837950.500", "449566.963", "5057373.563",
    "3837951.580", "449562.352", "5057373.170",
    "3837951.334", "449555.399", "5057373.982",
    "3837950.785", "449552.745", "5057374.635",
    "3837947.641", "449549.365", "5057377.300",
    "3837945.724", "449546.113", "5057379.033",
    "3837938.628", "449546.941", "5057384.284",
    "3837935.741", "449548.827", "5057386.281",
    "3837932.161", "449552.233", "5057388.660",
    "3837897.750", "449555.481", "5057414.196",
    "3837937.514", "449629.569", "5057377.652",
    "3837928.592", "449553.023", "5057391.268",
    "3837926.243", "449554.096", "5057392.934",
    "3837926.371", "449569.550", "5057391.441",
    "3837936.115", "449579.421", "5057383.235",
    "3837939.807", "449580.912", "5057380.329",
    "3837948.783", "449575.668", "5057374.065",
    "3837955.088", "449564.587", "5057370.334",
    "3837957.621", "449557.139", "5057369.106",
    "3837950.712", "449546.088", "5057375.291",
    "3837945.744", "449541.123", "5057379.469",
    "3837937.805", "449542.541", "5057385.300",
    "3837931.950", "449539.252", "5057389.992",
    "3837924.289", "449548.557", "5057394.901",
    "3837921.025", "449560.941", "5057396.232",
    "3837921.298", "449567.161", "5057395.465",
    "3837922.912", "449575.213", "5057393.525",
    "3837935.044", "449583.395", "5057383.680",
    "3837941.262", "449584.797", "5057378.886",
    "3837952.231", "449581.960", "5057370.909",
    "3837959.349", "449570.437", "5057366.607",
    "3837962.102", "449561.636", "5057365.336",
    "3837959.900", "449550.425", "5057368.003",
    "3837953.224", "449537.133", "5057374.215",
    "3837939.443", "449533.744", "5057384.865",
    "3837928.854", "449530.462", "5057393.111",
    "3837921.474", "449542.625", "5057397.550",
    "3837916.723", "449556.249", "5057399.885",
    "3837915.228", "449564.103", "5057400.297",
    "3837921.282", "449580.949", "5057394.230",
    "3837931.576", "449592.878", "5057385.426",
    "3837941.268", "449594.381", "5057378.015",
    "3837947.560", "449588.874", "5057373.790",
    "3837959.062", "449585.215", "5057365.486",
    "3837967.290", "449568.724", "5057360.801",
    "3837968.396", "449559.826", "5057360.776",
    "3837966.552", "449544.224", "5057363.570",
    "3837961.649", "449539.077", "5057367.715",
    "3837948.274", "449527.949", "5057378.760",
    "3837943.040", "449529.844", "5057382.518",
    "3837941.995", "449523.799", "5057383.849",
    "3837912.898", "449540.439", "5057404.185",
    "3837909.404", "449565.849", "5057404.511",
    "3837913.119", "449585.052", "5057399.987",
    "3837922.980", "449594.696", "5057391.714",
    "3837959.055", "449593.822", "5057364.714",
    "3837967.941", "449573.871", "5057359.847",
    "3837974.528", "449559.331", "5057356.217",
    "3837955.237", "449524.953", "5057373.805"
    ]
    }
    }
    }
    }
    },
    "AFH": {
    "STAT": {
    "AFH": {
    "STAT/AFH/HBA": {
    "properties": {
    "Antenna_Cables": [
    "85m", "85m", "85m", "85m", "85m", "85m",
    "85m", "85m", "85m", "85m", "85m", "85m",
    "85m", "85m", "115m", "115m", "85m", "85m",
    "85m", "85m", "85m", "115m", "115m", "115m",
    "85m", "85m", "85m", "85m", "115m", "115m",
    "115m", "115m", "85m", "85m", "85m", "115m",
    "115m", "115m", "115m", "115m", "115m", "115m",
    "115m", "115m", "115m", "115m", "115m", "115m"
    ],
    "Antenna_Field_Reference_ITRF": [
    "3837964.476", "449627.308", "5057357.613"
    ],
    "Antenna_Reference_ETRS": [
    "3837950.329", "449620.668", "5057368.838",
    "3837950.431", "449625.789", "5057368.299",
    "3837950.532", "449630.910", "5057367.760",
    "3837950.634", "449636.031", "5057367.221",
    "3837954.452", "449620.265", "5057365.780",
    "3837954.554", "449625.386", "5057365.241",
    "3837954.656", "449630.507", "5057364.701",
    "3837954.758", "449635.626", "5057364.162",
    "3837958.373", "449609.619", "5057363.799",
    "3837958.475", "449614.740", "5057363.260",
    "3837958.576", "449619.861", "5057362.721",
    "3837958.678", "449624.982", "5057362.182",
    "3837958.780", "449630.102", "5057361.642",
    "3837958.881", "449635.223", "5057361.103",
    "3837958.983", "449640.344", "5057360.564",
    "3837959.084", "449645.465", "5057360.025",
    "3837962.496", "449609.216", "5057360.740",
    "3837962.598", "449614.336", "5057360.201",
    "3837962.700", "449619.457", "5057359.662",
    "3837962.801", "449624.577", "5057359.123",
    "3837962.903", "449629.698", "5057358.584",
    "3837963.005", "449634.819", "5057358.044",
    "3837963.106", "449639.940", "5057357.505",
    "3837963.208", "449645.060", "5057356.966",
    "3837966.620", "449608.812", "5057357.682",
    "3837966.722", "449613.932", "5057357.143",
    "3837966.823", "449619.053", "5057356.604",
    "3837966.925", "449624.174", "5057356.064",
    "3837967.027", "449629.295", "5057355.525",
    "3837967.128", "449634.415", "5057354.986",
    "3837967.230", "449639.536", "5057354.447",
    "3837967.332", "449644.656", "5057353.908",
    "3837970.744", "449608.407", "5057354.623",
    "3837970.845", "449613.528", "5057354.084",
    "3837970.947", "449618.649", "5057353.545",
    "3837971.048", "449623.770", "5057353.006",
    "3837971.150", "449628.890", "5057352.466",
    "3837971.252", "449634.011", "5057351.927",
    "3837971.353", "449639.132", "5057351.388",
    "3837971.455", "449644.253", "5057350.849",
    "3837975.070", "449618.246", "5057350.486",
    "3837975.172", "449623.365", "5057349.947",
    "3837975.274", "449628.486", "5057349.407",
    "3837975.376", "449633.607", "5057348.868",
    "3837979.194", "449617.841", "5057347.427",
    "3837979.296", "449622.962", "5057346.888",
    "3837979.397", "449628.083", "5057346.349",
    "3837979.499", "449633.204", "5057345.810"
    ],
    "HBAT_PQR_rotation_angles_deg": [
    "10.00", "10.00", "10.00", "10.00", "10.00", "10.00",
    "10.00", "10.00", "10.00", "10.00", "10.00", "10.00",
    "10.00", "10.00", "10.00", "10.00", "10.00", "10.00",
    "10.00", "10.00", "10.00", "10.00", "10.00", "10.00",
    "10.00", "10.00", "10.00", "10.00", "10.00", "10.00",
    "10.00", "10.00", "10.00", "10.00", "10.00", "10.00",
    "10.00", "10.00", "10.00", "10.00", "10.00", "10.00",
    "10.00", "10.00", "10.00", "10.00", "10.00", "10.00"
    ],
    "PQR_to_ETRS_rotation_matrix": [
    "-0.1195951054", "-0.7919544517", "0.5987530018",
    "0.9928227484", "-0.0954186800", "0.0720990002",
    "0.0000330969", "0.6030782884", "0.7976820024"
    ]
    }
    }
    }
    }
    }
    }
    }
    ......@@ -12,7 +12,8 @@ jupyter-collaboration >= 3.0.0 # 3-Clause BSD
    # high-level access to station components.
    # NB: tangostationcontrol will also install lofar-station-client. The latter
    # is omitted here to avoid pip getting confused.
    tangostationcontrol >= 0.39
    # do change this file when you upgrade your version!
    tangostationcontrol >= 0.51.4
    --extra-index-url https://git.astron.nl/api/v4/groups/36/-/packages/pypi/simple
    PyTango
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment