Commit 2b517e4c authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

Updated mid directory name in configuration and Docker files.

parent b120ce9f
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -8,4 +8,4 @@ USER root
RUN DEBIAN_FRONTEND=noninteractive pip3 install https://nexus.engageska-portugal.pt/repository/pypi/packages/lmcbaseclasses/0.2.0+6bb55a6e/lmcbaseclasses-0.2.0+6bb55a6e.tar.gz
RUN DEBIAN_FRONTEND=noninteractive pip3 install https://nexus.engageska-portugal.pt/repository/pypi/packages/csp-lmc-common/0.3.1/csp-lmc-common-0.3.1.tar.gz

CMD ["/venv/bin/python","/app/csp-lmc-mid/MidCspMaster.py"]
CMD ["/venv/bin/python","/app/csp_lmc_mid/MidCspMaster.py"]
+4 −4
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ services:
             retry --max=5 -- tango_admin --ping-device mid_csp_cbf/sub_elt/master &&\
             retry --max=5 -- tango_admin --ping-device mid_csp_cbf/sub_elt/subarray_01 &&\
             retry --max=5 -- tango_admin --ping-device mid_csp/elt/master &&\
             /venv/bin/python /app/csp-lmc-mid/MidCspSubarray.py subarray1"
             /venv/bin/python /app/csp_lmc_mid/MidCspSubarray.py subarray1"
    volumes_from:
      - rsyslog-csplmc:rw

@@ -76,7 +76,7 @@ services:
             retry --max=5 -- tango_admin --ping-device mid_csp_cbf/sub_elt/master &&\
             retry --max=5 -- tango_admin --ping-device mid_csp_cbf/sub_elt/subarray_02 &&\
             retry --max=5 -- tango_admin --ping-device mid_csp/elt/master &&\
             /venv/bin/python /app/csp-lmc-mid/MidCspSubarray.py subarray2"
             /venv/bin/python /app/csp_lmc_mid/MidCspSubarray.py subarray2"
    volumes_from:
      - rsyslog-csplmc:rw

@@ -94,7 +94,7 @@ services:
     sh -c "wait-for-it.sh ${TANGO_HOST} --timeout=30 --strict --
            retry --max=5 -- tango_admin --ping-device mid_csp_cbf/sub_elt/master &&\
            retry --max=5 -- tango_admin --ping-device mid_csp/capability_monitor/search_beams &&\
            /venv/bin/python /app/csp-lmc-mid/MidCspMaster.py master"
            /venv/bin/python /app/csp_lmc_mid/MidCspMaster.py master"
   volumes_from:
     - rsyslog-csplmc:rw

@@ -109,7 +109,7 @@ services:
      - TANGO_HOST=${TANGO_HOST}
    command: >
      sh -c "wait-for-it.sh ${TANGO_HOST} --timeout=30 --strict --
             /venv/bin/python /app/csp-lmc-mid/MidCspCapabilityMonitor.py monitor"
             /venv/bin/python /app/csp_lmc_mid/MidCspCapabilityMonitor.py monitor"
    volumes_from:
      - rsyslog-csplmc:rw

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ test:
lint:
	# pylint needs to run twice
	cd /app && pylint -f colorized csp-lmc-mid| tee code_analysis.stdout; \
	cd /app && pylint csp-lmc-mid > lint_output.xml; \
	cd /app && pylint csp_lmc_mid > lint_output.xml; \
	if [ -d /build ]; then \
		mv /app/code_analysis.stdout /build/csplmc_code_analysis.stdout; \
		mv /app/lint_output.xml /build/lint_output.xml; \
+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ branch = True
source = csp-lmc-mid
[tool:pytest]
testpaths = tests
addopts = --cov=csp-lmc-mid
addopts = --cov=csp_lmc_mid
          --json-report
          --json-report-file=htmlcov/report.json 
          --cov-report=term 
+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ INFO = {}
with open("README.md") as file:
    long_description = file.read()

RELEASE_FILENAME = os.path.join(setup_dir, 'csp-lmc-mid','release.py')
RELEASE_FILENAME = os.path.join(setup_dir, 'csp_lmc_mid','release.py')
exec(open(RELEASE_FILENAME).read(), INFO)

setup(