From 550a3c0361e59325ed3f7b985d1283932b89d71f Mon Sep 17 00:00:00 2001 From: thijs snijder <snijder@astron.nl> Date: Wed, 6 Jul 2022 10:56:39 +0200 Subject: [PATCH] renamed files to psoc --- .gitlab-ci.yml | 8 ++++---- docker-compose/{device-pdu.yml => device-psoc.yml} | 0 .../docs/source/devices/{pdu.rst => psoc.rst} | 0 .../tangostationcontrol/devices/{pdu.py => psoc.py} | 0 .../devices/{test_device_pdu.py => test_device_psoc.py} | 0 .../devices/{test_pdu_device.py => test_psoc_device.py} | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename docker-compose/{device-pdu.yml => device-psoc.yml} (100%) rename tangostationcontrol/docs/source/devices/{pdu.rst => psoc.rst} (100%) rename tangostationcontrol/tangostationcontrol/devices/{pdu.py => psoc.py} (100%) rename tangostationcontrol/tangostationcontrol/integration_test/default/devices/{test_device_pdu.py => test_device_psoc.py} (100%) rename tangostationcontrol/tangostationcontrol/test/devices/{test_pdu_device.py => test_psoc_device.py} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4177e47e7..cc246b077 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,7 +100,7 @@ docker_build_image_all: - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-docker latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-observation latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-observation_control latest - - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-pdu latest + - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-psoc latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-recv latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-sdp latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-bst latest @@ -256,17 +256,17 @@ docker_build_image_device_apspu: script: # Do not remove 'bash' or statement will be ignored by primitive docker shell - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-apspu $tag -docker_build_image_device_pdu: +docker_build_image_device_psoc: extends: .base_docker_images_except only: refs: - merge_requests changes: - - docker-compose/device-pdu.yml + - docker-compose/device-psoc.yml - docker-compose/lofar-device-base/* script: # Do not remove 'bash' or statement will be ignored by primitive docker shell - - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-pdu $tag + - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-psoc $tag docker_build_image_device_tilebeam: extends: .base_docker_images_except only: diff --git a/docker-compose/device-pdu.yml b/docker-compose/device-psoc.yml similarity index 100% rename from docker-compose/device-pdu.yml rename to docker-compose/device-psoc.yml diff --git a/tangostationcontrol/docs/source/devices/pdu.rst b/tangostationcontrol/docs/source/devices/psoc.rst similarity index 100% rename from tangostationcontrol/docs/source/devices/pdu.rst rename to tangostationcontrol/docs/source/devices/psoc.rst diff --git a/tangostationcontrol/tangostationcontrol/devices/pdu.py b/tangostationcontrol/tangostationcontrol/devices/psoc.py similarity index 100% rename from tangostationcontrol/tangostationcontrol/devices/pdu.py rename to tangostationcontrol/tangostationcontrol/devices/psoc.py diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_pdu.py b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_psoc.py similarity index 100% rename from tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_pdu.py rename to tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_psoc.py diff --git a/tangostationcontrol/tangostationcontrol/test/devices/test_pdu_device.py b/tangostationcontrol/tangostationcontrol/test/devices/test_psoc_device.py similarity index 100% rename from tangostationcontrol/tangostationcontrol/test/devices/test_pdu_device.py rename to tangostationcontrol/tangostationcontrol/test/devices/test_psoc_device.py -- GitLab