diff --git a/csp-lmc-common/.gitlab-ci.yml b/csp-lmc-common/.gitlab-ci.yml index bfab5c922831221fa608149910314a80cff33f13..bd698be553cd1fc338980ff466e86cc1a87c1508 100644 --- a/csp-lmc-common/.gitlab-ci.yml +++ b/csp-lmc-common/.gitlab-ci.yml @@ -42,19 +42,19 @@ build:csp-lmc-common_pkg: # # Build csp-lmc-common image # -build:csp-lmc-common_image: - image: nexus.engageska-portugal.pt/ska-docker/tango-builder:latest - before_script: - - docker login -u $DOCKER_REGISTRY_USERNAME -p $DOCKER_REGISTRY_PASSWORD $DOCKER_REGISTRY_HOST - tags: - - k8srunner - - engageska - stage: build_common - script: - - cd $COMMON_BUILD_PATH - - make build - variables: - COMMON_BUILD_PATH: csp-lmc-common/docker +#build:csp-lmc-common_image: +# image: nexus.engageska-portugal.pt/ska-docker/tango-builder:latest +# before_script: +# - docker login -u $DOCKER_REGISTRY_USERNAME -p $DOCKER_REGISTRY_PASSWORD $DOCKER_REGISTRY_HOST +# tags: +# - k8srunner +# - engageska +# stage: build_common +# script: +# - cd $COMMON_BUILD_PATH +# - make build +# variables: +# COMMON_BUILD_PATH: csp-lmc-common/docker # # Test csp-lmc-common project @@ -160,18 +160,18 @@ publish:csp-lmc-common: # # Release csp-lmc-common image on nexus # -release csp-lmc-common image: - tags: - - k8srunner - stage: release - dependencies: - - build:csp-lmc-common_image - script: - - cd $COMMON_BUILD_PATH - - make push - when: manual - only: - refs: - - master - variables: - COMMON_BUILD_PATH: csp-lmc-common/docker +#release csp-lmc-common image: +# tags: +# - k8srunner +# stage: release +# dependencies: +# - build:csp-lmc-common_image +# script: +# - cd $COMMON_BUILD_PATH +# - make push +# when: manual +# only: +# refs: +# - master +# variables: +# COMMON_BUILD_PATH: csp-lmc-common/docker diff --git a/csp-lmc-common/requirements.txt b/csp-lmc-common/requirements.txt index 558ef5c350895569fb72ba7ccb3013507c8b7081..6f987de9eabf63d2cd96de9cbc38e02c5b853df2 100644 --- a/csp-lmc-common/requirements.txt +++ b/csp-lmc-common/requirements.txt @@ -3,4 +3,4 @@ pytango >= 9.3.2 jsonschema >= 3.2.0 lmcbaseclasses >= 0.8.1 ska-log-transactions -ska-telescope-model +ska-telescope-model==0.2.0