Commit a6fe6c30 authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

tango-util: Updated HELM charts to: 

tango-util 0.2.4
tango-base 0.2.7
parent 80f8f23a

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

+14 −16
Original line number Diff line number Diff line
@@ -188,22 +188,20 @@ publish:csp-lmc-mid: 
  variables:

    BUILD_PATH: csp-lmc-mid



publish_chart:

  variables:

    CHARTS_TO_PUBLISH: csp-proto

  stage: publish

  when: manual

  tags:

  - k8srunner

  image: nexus.engageska-portugal.pt/ska-docker/deploy:0.4.2

# Standardised included jobs

before_script:

    - apt-get -y update     

    - apt-get install -y curl ca-certificates --no-install-recommends

  script:

    - cd $BUILD_PATH

    - curl -s https://gitlab.com/ska-telescope/stupid/raw/master/scripts/publish-charts.sh | bash

  - cd BUILD_PATH

variables:

  CHARTS_TO_PUBLISH: mid-csp

  BUILD_PATH: csp-lmc-mid

include:

# Helm Chart Publish

# https://developer.skatelescope.org/en/latest/development/software_package_release_procedure.html#package-and-publish-helm-charts-to-the-ska-helm-chart-repository

- project: 'ska-telescope/templates-repository'

  file: 'gitlab-ci/includes/helm_publish.yml'









#

# Release csp-lmc-mid image on nexus

csp-lmc-mid/.make/k8s.mk

+6 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ dep-up: ## update dependencies for every charts in the env var CHARTS 


# This job is used to create a deployment of tmc-mid charts

# Currently umbreall chart for tmc-mid path is given

install-chart: dep-up namespace ## install the helm chart with name HELM_RELEASE and path UMBRELLA_CHART_PATH on the namespace KUBE_NAMESPACE 

install-chart: clean dep-up namespace ## install the helm chart with name HELM_RELEASE and path UMBRELLA_CHART_PATH on the namespace KUBE_NAMESPACE 

	@echo $(TANGO_HOST)

	@sed -e 's/CI_PROJECT_PATH_SLUG/$(CI_PROJECT_PATH_SLUG)/' $(UMBRELLA_CHART_PATH)values.yaml > generated_values.yaml; \

	sed -e 's/CI_ENVIRONMENT_SLUG/$(CI_ENVIRONMENT_SLUG)/' generated_values.yaml > values.yaml; \
@@ -237,6 +237,11 @@ k8s_test = tar -c . | \ 
                cat /tmp/build.tgz | base64 && \

                echo '~~~~BOUNDARY~~~~'" \

                2>&1

# to resolve the problem with the forwarded attributes, the CSP.LMC devices have to be restarted.

restart_csp: 

	kubectl delete pod -l app=mid-csp-lmc -n $(KUBE_NAMESPACE);\

	kubectl -n $(KUBE_NAMESPACE) wait --for=condition=ready -l app=mid-csp-lmc --timeout=60s pods || exit 1





rlint:  ## run lint check on Helm Chart using gitlab-runner

	if [ -n "$(RDEBUG)" ]; then DEBUG_LEVEL=debug; else DEBUG_LEVEL=warn; fi && \

csp-lmc-mid/charts/mid-csp-umbrella/Chart.yaml

+3 −3
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ appVersion: 0.6.9 
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png

dependencies:

- name: tango-base

  version: 0.2.6

  version: 0.2.7

  repository: https://nexus.engageska-portugal.pt/repository/helm-chart

- name: mid-cbf

  version: 0.1.0

  version: 0.1.1

  repository: https://nexus.engageska-portugal.pt/repository/helm-chart

- name: mid-cbf-tmleafnode

  version: 0.1.0

  version: 0.1.1

  repository: https://nexus.engageska-portugal.pt/repository/helm-chart

- name: mid-csp

  version: 0.1.0

csp-lmc-mid/charts/mid-csp/Chart.yaml

+2 −2
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ appVersion: "0.6.9" 
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png

dependencies:

- name: tango-util

  version: 0.2.2

  version: 0.2.4

  repository: https://nexus.engageska-portugal.pt/repository/helm-chart

- name: tango-base

  version: 0.2.6

  version: 0.2.7

  repository: https://nexus.engageska-portugal.pt/repository/helm-chart

  condition: tango-base.enabled,global.sub-system.tango-base.enabled

csp-lmc-mid/tests/test_data/test_ConfigureScan_ADR4.json

+1 −1
Original line number Diff line number Diff line 
{

    "id": "sbi-mvp01-20200325-00002-science_A",

    "frequencyBand": "1",

    "delayModelSubscriptionPoint": "ska_mid/tm_leaf_node/csp_subarray01/delayModel",

    "delayModelSubscriptionPoint": "ska_mid/tm_leaf_node/csp_subarray_01/delayModel",



    "fsp": [

        {