From cf660d4995ab2212f65a8cbc8bf9f0b405708708 Mon Sep 17 00:00:00 2001 From: toor Date: Thu, 8 Oct 2020 08:56:37 +0200 Subject: [PATCH] update-runners: Use k8srunner to run pipelines. Updated the ephemeral storage limits and csp-proto char version. --- .gitlab-ci.yml | 6 +++--- csp-lmc-common/.gitlab-ci.yml | 12 ++++++------ csp-lmc-mid/.gitlab-ci.yml | 16 ++++++++-------- csp-lmc-mid/charts/csp-proto/Chart.yaml | 2 +- csp-lmc-mid/charts/csp-proto/values.yaml | 4 ++-- csp-lmc-mid/charts/mid-csp/Chart.yaml | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2ca940..f8af453 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/csp-lmc-common/.gitlab-ci.yml b/csp-lmc-common/.gitlab-ci.yml index bad97a8..c979fe1 100644 --- a/csp-lmc-common/.gitlab-ci.yml +++ b/csp-lmc-common/.gitlab-ci.yml @@ -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 diff --git a/csp-lmc-mid/.gitlab-ci.yml b/csp-lmc-mid/.gitlab-ci.yml index 982623c..82f3e40 100644 --- a/csp-lmc-mid/.gitlab-ci.yml +++ b/csp-lmc-mid/.gitlab-ci.yml @@ -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 diff --git a/csp-lmc-mid/charts/csp-proto/Chart.yaml b/csp-lmc-mid/charts/csp-proto/Chart.yaml index 4108cad..e4f8d6d 100644 --- a/csp-lmc-mid/charts/csp-proto/Chart.yaml +++ b/csp-lmc-mid/charts/csp-proto/Chart.yaml @@ -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 diff --git a/csp-lmc-mid/charts/csp-proto/values.yaml b/csp-lmc-mid/charts/csp-proto/values.yaml index 7cefdf1..54d34cd 100644 --- a/csp-lmc-mid/charts/csp-proto/values.yaml +++ b/csp-lmc-mid/charts/csp-proto/values.yaml @@ -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 diff --git a/csp-lmc-mid/charts/mid-csp/Chart.yaml b/csp-lmc-mid/charts/mid-csp/Chart.yaml index 9812dab..9cbfdb6 100644 --- a/csp-lmc-mid/charts/mid-csp/Chart.yaml +++ b/csp-lmc-mid/charts/mid-csp/Chart.yaml @@ -10,6 +10,6 @@ dependencies: repository: https://gitlab.com/ska-telescope/skampi/-/raw/master/repository condition: tango-base.enabled - name: csp-proto - version: 0.2.1 + version: 0.2.2 repository: "file://../csp-proto" condition: csp-proto.enabled -- GitLab