Skip to content
Snippets Groups Projects
Commit 6329f760 authored by Matteo Di Carlo's avatar Matteo Di Carlo
Browse files

Merge branch 'dppt-438-update-pytango' into 'master'

ST-1389: Update pytango to 9.3.6

See merge request ska-telescope/ska-tango-images!174
parents 0c334a35 71007768
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,7 @@ image: $SKA_K8S_TOOLS_DOCKER_BUILDER_IMAGE
variables:
GIT_SUBMODULE_STRATEGY: recursive
OCI_BUILD_ADDITIONAL_TAGS: $CI_COMMIT_SHORT_SHA
stages:
- lint
......@@ -52,6 +53,17 @@ before_script:
echo "Image to build: ${IMG}"; docker pull ${IMG} || true;
- make oci-build OCI_IMAGE=${OCI_IMAGE} CAR_OCI_REGISTRY_HOST=${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME} RELEASE_CONTEXT_DIR=images/${OCI_IMAGE} OCI_BUILD_ADDITIONAL_ARGS="--no-cache --build-arg BUILD_IMAGE --build-arg BASE_IMAGE "
ska-tango-examples-tests:
variables:
BUILD_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/ska-tango-images-pytango-builder:$CI_COMMIT_SHORT_SHA"
BASE_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/ska-tango-images-pytango-runtime:$CI_COMMIT_SHORT_SHA"
OCI_BUILD_ADDITIONAL_ARGS: "--no-cache --build-arg BUILD_IMAGE --build-arg BASE_IMAGE "
SKA_PYTHON_PYTANGO_BUILDER_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/ska-tango-images-pytango-builder:$CI_COMMIT_SHORT_SHA"
PYTANGO_VERSION: "9.3.6"
trigger:
project: ska-telescope/ska-tango-examples
strategy: depend
.tango-dependencies_rules:
rules:
- if: '$CI_COMMIT_TAG'
......
.make @ f7312752
Subproject commit b41949598ba72e541035608dd96db83337290ff5
Subproject commit f7312752a10b8aac8938c39064121f1dbfb4f840
release=0.3.23
tag=0.3.23
release=0.3.24
tag=0.3.24
......@@ -7,7 +7,7 @@ KUBE_NAMESPACE ?= ska-tango-images#namespace to be used
RELEASE_NAME ?= test## release name of the chart
K8S_CHART = ska-tango-umbrella
MINIKUBE ?= true ## Minikube or not
K8S_TEST_IMAGE_TO_TEST ?= artefact.skao.int/ska-tango-images-tango-itango:9.3.9 ## TODO: UGUR docker image that will be run for testing purpose
ITANGO_VERSION ?= $(shell make show-version RELEASE_CONTEXT_DIR=images/ska-tango-images-tango-itango)
CI_JOB_ID ?= local##pipeline job id
TEST_RUNNER ?= test-mk-runner-$(CI_JOB_ID)##name of the pod running the k8s_tests
TANGO_HOST ?= makefile-databaseds-also-node-port:10000## TANGO_HOST connection to the Tango DS
......@@ -46,6 +46,12 @@ include .make/base.mk
# include your own private variables for custom deployment configuration
-include PrivateRules.mak
ifneq ($(CI_REGISTRY),)
K8S_TEST_IMAGE_TO_TEST=$(CI_REGISTRY)/ska-telescope/ska-tango-images/ska-tango-images-tango-itango:$(ITANGO_VERSION)
else
K8S_TEST_IMAGE_TO_TEST=artefact.skao.int/ska-tango-images-tango-itango:$(ITANGO_VERSION)
endif
oci-bump-patch-release: ## Bump patch release for all OCI Image .release files in ./images/<dir>
$(foreach ociimage,$(OCI_IMAGES_TO_PUBLISH), make bump-patch-release RELEASE_CONTEXT_DIR=images/$(ociimage);)
......
......@@ -2,7 +2,7 @@ apiVersion: v2
appVersion: 0.3.23
description: A Helm chart for deploying the TANGO base system on Kubernetes
name: ska-tango-base
version: 0.3.23
version: 0.3.24
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies:
- name: ska-tango-util
......
......@@ -6,7 +6,7 @@ version: 0.2.5
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies:
- name: ska-tango-base
version: 0.3.23
version: 0.3.24
repository: file://../ska-tango-base
condition: ska-tango-base.enabled,global.sub-system.ska-tango-base.enabled
- name: ska-tango-util
......
release=9.3.32
tag=9.3.32
release=9.3.33
tag=9.3.33
......@@ -58,6 +58,6 @@ RUN python3 -m pip install --no-cache-dir numpy==1.23.0
ENV POETRY_HOME=/opt/poetry
RUN curl -sSL https://install.python-poetry.org | python3 - --yes
RUN python3 -m pip install --no-cache-dir pytango==9.3.3
RUN python3 -m pip install --no-cache-dir pytango==9.3.6
RUN ln -sfn /usr/bin/python3 /usr/bin/python && ln -sfn /opt/poetry/bin/poetry /usr/local/bin/poetry
release=9.3.19
tag=9.3.19
release=9.3.20
tag=9.3.20
release=1.5.7
tag=1.5.7
release=1.5.8
tag=1.5.8
release=9.3.10
tag=9.3.10
release=9.3.11
tag=9.3.11
release=9.3.9
tag=9.3.9
release=9.3.10
tag=9.3.10
......@@ -7,6 +7,7 @@ pycodestyle<2.7.0,>=2.6.0a1
pytest-bdd==5.0.0
pytest-ordering
pytest-timeout
pytest-forked
elasticsearch
kubernetes
assertpy
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment