Merge branch 'update-runners' into 'master' (541b0f4e) · Commits · Gianluca Marotta / csp-lmc-old

.gitlab-ci.yml

+3 −3

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ stages:
		clean shell runner:
		stage: .pre
		tags:
		- docker-executor
		- k8srunner
		script:
		# Gitlab CI badges creation
		- pwd
		@@ -65,7 +65,7 @@ clean shell runner:
		#
		pages:
		tags:
		- docker-executor
		- k8srunner
		stage: pages
		variables:
		COMMON_PATH: csp-lmc-common/
		@@ -103,7 +103,7 @@ create ci metrics:
		image: nexus.engageska-portugal.pt/ska-docker/ska-python-buildenv:latest
		when: always
		tags:
		- docker-executor
		- k8srunner
		script:
		- ls -lR
		# copy public in build because ci-metrics scripts look for files in build

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		dependencies: []
		image: nexus.engageska-portugal.pt/ska-docker/ska-python-buildenv:latest
		tags:
		- docker-executor
		- k8srunner
		- engageska
		artifacts:
		paths:
		@@ -47,7 +47,7 @@ build:csp-lmc-common_image:
		before_script:
		- docker login -u $DOCKER_REGISTRY_USERNAME -p $DOCKER_REGISTRY_PASSWORD $DOCKER_REGISTRY_HOST
		tags:
		- docker-executor
		- k8srunner
		- engageska
		stage: build_common
		script:
		@@ -63,7 +63,7 @@ build:csp-lmc-common_image:
		.test_common:
		image: nexus.engageska-portugal.pt/ska-docker/ska-python-buildenv:latest
		tags:
		- docker-executor
		- k8srunner
		artifacts:
		paths:
		- ./$COMMON_BUILD_PATH/build/
		@@ -92,7 +92,7 @@ linting:csp-lmc-common:
		image: nexus.engageska-portugal.pt/ska-docker/ska-python-buildenv:latest
		stage: linting_common
		tags:
		- docker-executor
		- k8srunner
		artifacts:
		paths:
		- ./$COMMON_BUILD_PATH/build/
		@@ -121,7 +121,7 @@ linting:csp-lmc-common:
		TWINE_USERNAME: $TWINE_USERNAME
		TWINE_PASSWORD: $TWINE_PASSWORD
		tags:
		- docker-executor
		- k8srunner
		before_script:
		- python3 -m pip install twine

		@@ -162,7 +162,7 @@ publish:csp-lmc-common:
		#
		release csp-lmc-common image:
		tags:
		- docker-executor
		- k8srunner
		stage: release
		dependencies:
		- build:csp-lmc-common_image

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		image: nexus.engageska-portugal.pt/ska-docker/ska-python-buildenv:latest
		dependencies: []
		tags:
		- docker-executor
		- k8srunner
		artifacts:
		paths:
		- ./$BUILD_PATH/dist/
		@@ -46,7 +46,7 @@ build:csp-lmc-mid_image:
		before_script:
		- docker login -u $DOCKER_REGISTRY_USERNAME -p $DOCKER_REGISTRY_PASSWORD $DOCKER_REGISTRY_HOST
		tags:
		- docker-executor
		- k8srunner
		stage: build
		script:
		- cd $BUILD_PATH
		@@ -62,7 +62,7 @@ build:csp-lmc-mid_image:
		# - docker login -u $DOCKER_REGISTRY_USERNAME -p $DOCKER_REGISTRY_PASSWORD $DOCKER_REGISTRY_HOST
		# - *install_pip
		# tags:
		# - docker-executor
		# - k8srunner
		# script:
		# - echo $(ls -d ./dist/*.whl \| grep $CI_COMMIT_SHORT_SHA)
		# - pip3 install -U $(ls -d ./csp-lmc-mid/dist/*.whl \| grep $CI_COMMIT_SHORT_SHA) --extra-index-url https://nexus.engageska-portugal.pt/repository/pypi/simple
		@@ -102,7 +102,7 @@ build:csp-lmc-mid_image:

		integration:csp-lmc-mid:
		tags:
		- docker-executor
		- k8srunner
		extends: .test
		image: nexus.engageska-portugal.pt/ska-docker/deploy:0.4.1
		script:
		@@ -125,7 +125,7 @@ linting:csp-lmc-mid:
		image: nexus.engageska-portugal.pt/ska-docker/ska-python-buildenv:latest
		stage: linting
		tags:
		- docker-executor
		- k8srunner
		artifacts:
		paths:
		- ./$BUILD_PATH/build/
		@@ -154,7 +154,7 @@ linting:csp-lmc-mid:
		TWINE_USERNAME: $TWINE_USERNAME
		TWINE_PASSWORD: $TWINE_PASSWORD
		tags:
		- docker-executor
		- k8srunner
		before_script:
		- pip install twine

		@@ -194,7 +194,7 @@ publish_chart:
		stage: publish
		when: manual
		tags:
		- docker-executor
		- k8srunner
		image: nexus.engageska-portugal.pt/ska-docker/deploy:0.4.2
		before_script:
		- apt-get -y update
		@@ -210,7 +210,7 @@ publish_chart:
		#
		release csp-lmc-mid image:
		tags:
		- docker-executor
		- k8srunner
		stage: release
		dependencies:
		- build:csp-lmc-mid_image

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,5 +2,5 @@ apiVersion: v1
		appVersion: "0.6.9"
		description: A Helm chart for deploying the Mid_CSP.LMC devices on Kubernetes
		name: csp-proto
		version: 0.2.1
		version: 0.2.2
		icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -74,8 +74,8 @@ resources:
		requests:
		cpu: 150m # 150m = 0.15 CPU
		memory: 128Mi # 128Mi = 0.12 GB mem
		ephemeral-storage: 1Gi
		ephemeral-storage: 256Mi
		limits:
		cpu: 250m # 250m = 0.25 CPU
		memory: 256Mi # 256Mi = 0.25 GB mem
		ephemeral-storage: 2Gi
		ephemeral-storage: 512Mi