Commit 8f7e086a authored by Matteo Di Carlo's avatar Matteo Di Carlo
Browse files

Merge branch 'CT-147' of https://gitlab.com/ska-telescope/csp-lmc into CT-147

parents 631c06c0 b3f6c38a

.gitlab-ci.yml

+4 −5
Original line number Diff line number Diff line
@@ -42,10 +42,10 @@ stages: 
  - publish_common

  - build

  - linting

  - release

  - test

  - pages

  - publish

  - release

  - pages



.install_pip: &install_pip |-

  apt-get -y update && apt-get install -yq curl python3-distutils
@@ -69,7 +69,7 @@ pages: 
  stage: pages

  variables:

    COMMON_PATH: csp-lmc-common/

    MIDCSP_PATH: csp-lmc-mid/docker

    MIDCSP_PATH: csp-lmc-mid/

  script:

    - pwd

    - python3 -m pip install junitparser
@@ -80,9 +80,8 @@ pages: 
    # path to  all files is relative to the repository

    # that has been cloned during the build

    - cp -R $COMMON_PATH/build/ public

    - ls -l public

    - cp -R $MIDCSP_PATH/build/* public

    - ls -lR 

    - ls -lR public

    - junitparser merge public/reports/csp-lmc-common-unit-tests.xml public/reports/csp-lmc-mid-unit-tests.xml public/reports/unit-tests.xml

    - ls -lR 

    - junitparser merge public/reports/csp-lmc-common-linting.xml public/reports/csp-lmc-mid-linting.xml public/reports/linting.xml

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

+19 −5
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ integration:csp-lmc-mid: 
  script:

    - cd $BUILD_PATH  

    - make k8s_test

    - ls -lR

  environment:

      name: test

  after_script:
@@ -184,21 +185,34 @@ publish:csp-lmc-mid: 
  variables:

    BUILD_PATH: csp-lmc-mid



publish:helm-chart:

  stage: publish

  tags:

    - docker-executor

  dependencies:

    - integration:csp-lmc-mid

  script:

    - cd $BUILD_PATH

    - make package

  variables:

    BUILD_PATH: csp-lmc-mid

  artifacts:

    paths:

      - ./$BUILD_PATH/build/

#

# Release csp-lmc-mid image on nexus

#

release csp-lmc-mid image:

  stage: release

  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:

    - docker-executor

  stage: release

  dependencies:

    - build:csp-lmc-mid_image

  script:

    - cd $BUILD_PATH      

    - make push

  when: manual

  only:

    refs:

      - master

  variables:

    BUILD_PATH: csp-lmc-mid

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

+7 −0
Original line number Diff line number Diff line
@@ -30,6 +30,13 @@ deploy: namespace mkcerts depends ## deploy the helm chart 


delete: ## delete the helm chart release

	@helm uninstall $(HELM_RELEASE) --namespace $(KUBE_NAMESPACE)

	# if charts deployed locally, remove the repo charts files

	# created in charts/mid-csp/charts directory

	@if [ "a"$(CI_JOB_ID) == "a" ]; then \

	find ./charts -type f -name "tango*" -delete; \

	find ./charts -type f -name "csp-proto*" -delete; \

	find ./charts -type f -name "requirements.lock" -delete; \

	fi



install: namespace mkcerts  ## install the helm chart

	@helm install $(HELM_RELEASE) charts/$(HELM_CHART)/ \

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

+7 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ IMAGE=$(DOCKER_REGISTRY_HOST)/$(DOCKER_REGISTRY_USER)/$(NAME) 


VERSION=$(shell . $(RELEASE_SUPPORT) ; getVersion)

TAG=$(shell . $(RELEASE_SUPPORT); getTag)

BASE_RELEASE=$(shell . $(RELEASE_SUPPORT) ;getRelease)



SHELL=/bin/bash
@@ -59,8 +60,12 @@ docker-build: .release 
	if [ $$DOCKER_MAJOR -eq 1 ] && [ $$DOCKER_MINOR -lt 10 ] ; then \

		echo docker tag -f $(IMAGE):$(VERSION) $(IMAGE):latest ;\

		docker tag -f $(IMAGE):$(VERSION) $(IMAGE):latest ;\

		echo docker tag $(IMAGE):$(VERSION) $(IMAGE):$(BASE_RELEASE) ;\

		docker tag $(IMAGE):$(VERSION) $(IMAGE):$(BASE_RELEASE) ;\

	else \

		echo docker tag $(IMAGE):$(VERSION) $(IMAGE):latest ;\

		echo docker tag $(IMAGE):$(VERSION) $(IMAGE):$(BASE_RELEASE) ;\

		docker tag $(IMAGE):$(VERSION) $(IMAGE):$(BASE_RELEASE) ;\

		docker tag $(IMAGE):$(VERSION) $(IMAGE):latest ; \

	fi
@@ -75,8 +80,8 @@ release: check-status check-release build push 
push: pre-push do-push post-push  ## push the image to the Docker registry



do-push:

#	docker push $(IMAGE):$(VERSION)

	docker push $(IMAGE):latest

	docker push $(IMAGE):$(BASE_RELEASE)

#	docker push $(IMAGE):latest



snapshot: build push

csp-lmc-mid/charts/csp-proto/values.yaml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ csplmc: 
  image:

    registry: nexus.engageska-portugal.pt/ska-docker

    image: mid-csp-lmc

    tag: latest

    tag: 0.6.9

    pullPolicy: IfNotPresent



deviceServers: