Commit 5873d591 authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

AT5-259: Modified mid-project Dockerfile to use latest ska-python images. 

Don't start mid-pss-master container.
Use a modified mid-cbf-mcs image (tagget as 'test') to run the csp-lmc-mid tests.
parent aebe4452

csp-lmc-common/.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ build:csp-lmc-common_image: 


.publish_python:

  stage: publish

  image: nexus.engageska-portugal.pt/ska-docker/ska-python-buildenv:latest

  variables:

    TWINE_USERNAME: $TWINE_USERNAME

    TWINE_PASSWORD: $TWINE_PASSWORD

csp-lmc-mid/.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ linting: 


.publish_python:

  stage: publish

  image: nexus.engageska-portugal.pt/ska-docker/ska-python-buildenv:latest

  variables:

    TWINE_USERNAME: $TWINE_USERNAME

    TWINE_PASSWORD: $TWINE_PASSWORD

csp-lmc-mid/docker/Dockerfile

+2 −2
Original line number Diff line number Diff line 
FROM nexus.engageska-portugal.pt/ska-docker/ska-python-buildenv:0.2.2 AS buildenv

FROM nexus.engageska-portugal.pt/ska-docker/ska-python-runtime:0.2.2 AS runtime

FROM nexus.engageska-portugal.pt/ska-docker/ska-python-buildenv:latest AS buildenv

FROM nexus.engageska-portugal.pt/ska-docker/ska-python-runtime:latest AS runtime



# create ipython profile to so that itango doesn't fail if ipython hasn't run yet

RUN ipython profile create

csp-lmc-mid/docker/mid-cbf-mcs.yml

+13 −13
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ services: 
      - .:/csplmc



  cbfmaster:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:latest

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}cbfmaster

    depends_on:
@@ -53,7 +53,7 @@ services: 




  cbfsubarray01:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:latest

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}cbfsubarray01

    depends_on:
@@ -75,7 +75,7 @@ services: 




  cbfsubarray02:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:latest

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}cbfsubarray02

    depends_on:
@@ -97,7 +97,7 @@ services: 




  vcc001:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:latest

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}vcc001

    depends_on:
@@ -118,7 +118,7 @@ services: 




  vcc002:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:latest

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}vcc002

    depends_on:
@@ -139,7 +139,7 @@ services: 




  vcc003:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:latest

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}vcc003

    depends_on:
@@ -160,7 +160,7 @@ services: 




  vcc004:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:latest

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}vcc004

    depends_on:
@@ -181,7 +181,7 @@ services: 




  fsp01:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:latest

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}fsp01

    depends_on:
@@ -197,7 +197,7 @@ services: 
      - rsyslog-cbf:rw



  fsp02:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:latest

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}fsp02

    depends_on:
@@ -213,7 +213,7 @@ services: 
      - rsyslog-cbf:rw



  fsp03:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:latest

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}fsp03

    depends_on:
@@ -230,7 +230,7 @@ services: 




  fsp04:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:latest

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}fsp04

    depends_on:
@@ -247,7 +247,7 @@ services: 




  tmcspsubarrayleafnodetest:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:latest

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}tmcspsubarrayleafnodetest

    depends_on:
@@ -265,7 +265,7 @@ services: 
      - rsyslog-cbf:rw



  tmcspsubarrayleafnodetest2:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:latest

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mid-cbf-mcs:test

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}tmcspsubarrayleafnodetest2

    depends_on:

csp-lmc-mid/docker/mid-csp-lmc.yml

+30 −31
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ services: 
   depends_on:

     - midcsp_dsconfig

     - cbfmaster

      - midpssmaster

     - rsyslog-csplmc

   environment:

     - TANGO_HOST=${TANGO_HOST}
@@ -95,20 +94,20 @@ services: 
    volumes_from:

      - rsyslog-csplmc:rw



  midpssmaster:

    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/csp-lmc-common:latest

    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}midpssmaster

    depends_on:

      - midcsp_dsconfig

      - rsyslog-csplmc

    environment:

      - TANGO_HOST=${TANGO_HOST}

    command: >

      sh -c "wait-for-it.sh ${TANGO_HOST} --timeout=30 --strict --

            /venv/bin/python /app/simulators/DeviceTestMaster/PssMasterSimulator.py midpss"

    volumes_from:

      - rsyslog-csplmc:rw

#  midpssmaster:

#   image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/csp-lmc-common:latest

#   network_mode: ${NETWORK_MODE}

#   container_name: ${CONTAINER_NAME_PREFIX}midpssmaster

#   depends_on:

#     - midcsp_dsconfig

#     - rsyslog-csplmc

#   environment:

#     - TANGO_HOST=${TANGO_HOST}

#   command: >

#     sh -c "wait-for-it.sh ${TANGO_HOST} --timeout=30 --strict --

#           /venv/bin/python /app/simulators/DeviceTestMaster/PssMasterSimulator.py midpss"

#   volumes_from:

#     - rsyslog-csplmc:rw



  rsyslog-csplmc: 

    image: jumanjiman/rsyslog