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

Merge branch 'st-1431-get-pytango-version-for-tests' into 'master'

Bug fix and improvements

See merge request ska-telescope/ska-tango-images!178
parents 7ab1394d 23aec568
No related branches found
No related tags found
No related merge requests found
...@@ -68,6 +68,9 @@ before_script: ...@@ -68,6 +68,9 @@ before_script:
ska-tango-examples-tests: ska-tango-examples-tests:
stage: test stage: test
tags:
- k8srunner
retry: 2
script: script:
- | - |
VERS=$(make show-version RELEASE_CONTEXT_DIR=images/ska-tango-images-pytango-builder) VERS=$(make show-version RELEASE_CONTEXT_DIR=images/ska-tango-images-pytango-builder)
...@@ -75,7 +78,7 @@ ska-tango-examples-tests: ...@@ -75,7 +78,7 @@ ska-tango-examples-tests:
VERS=$(make show-version RELEASE_CONTEXT_DIR=images/ska-tango-images-pytango-runtime) VERS=$(make show-version RELEASE_CONTEXT_DIR=images/ska-tango-images-pytango-runtime)
export BASE_IMAGE="${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/ska-tango-images-pytango-runtime:${VERS}" export BASE_IMAGE="${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/ska-tango-images-pytango-runtime:${VERS}"
export OCI_BUILD_ADDITIONAL_ARGS="--no-cache --build-arg BUILD_IMAGE --build-arg BASE_IMAGE " export OCI_BUILD_ADDITIONAL_ARGS="--no-cache --build-arg BUILD_IMAGE --build-arg BASE_IMAGE "
export PYTANGO_VERSION="9.3.6" export PYTANGO_VERSION="$(docker run ${BUILD_IMAGE} pip list | grep pytango | awk '{print $2}')"
response=$(curl --request POST \ response=$(curl --request POST \
--form token=$CI_JOB_TOKEN \ --form token=$CI_JOB_TOKEN \
--form ref=master \ --form ref=master \
......
release=0.3.24 release=0.3.25
tag=0.3.24 tag=0.3.25
...@@ -2,9 +2,9 @@ apiVersion: v2 ...@@ -2,9 +2,9 @@ apiVersion: v2
appVersion: 0.3.23 appVersion: 0.3.23
description: A Helm chart for deploying the TANGO base system on Kubernetes description: A Helm chart for deploying the TANGO base system on Kubernetes
name: ska-tango-base name: ska-tango-base
version: 0.3.24 version: 0.3.25
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies: dependencies:
- name: ska-tango-util - name: ska-tango-util
version: 0.3.22 version: 0.3.23
repository: file://../ska-tango-util repository: file://../ska-tango-util
...@@ -2,14 +2,14 @@ apiVersion: v2 ...@@ -2,14 +2,14 @@ apiVersion: v2
appVersion: 0.2.5 appVersion: 0.2.5
description: A Helm chart for deploying the TANGO base system on Kubernetes description: A Helm chart for deploying the TANGO base system on Kubernetes
name: ska-tango-umbrella name: ska-tango-umbrella
version: 0.2.5 version: 0.2.6
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies: dependencies:
- name: ska-tango-base - name: ska-tango-base
version: 0.3.24 version: 0.3.25
repository: file://../ska-tango-base repository: file://../ska-tango-base
condition: ska-tango-base.enabled,global.sub-system.ska-tango-base.enabled condition: ska-tango-base.enabled,global.sub-system.ska-tango-base.enabled
- name: ska-tango-util - name: ska-tango-util
version: 0.3.22 version: 0.3.23
repository: file://../ska-tango-util repository: file://../ska-tango-util
...@@ -2,8 +2,8 @@ apiVersion: v2 ...@@ -2,8 +2,8 @@ apiVersion: v2
description: A Helm chart library of utilities for TANGO deployents description: A Helm chart library of utilities for TANGO deployents
name: ska-tango-util name: ska-tango-util
type: library type: library
appVersion: 0.3.22 appVersion: 0.3.23
version: 0.3.22 version: 0.3.23
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
maintainers: maintainers:
- name: Matteo Di Carlo - name: Matteo Di Carlo
......
...@@ -312,13 +312,13 @@ spec: ...@@ -312,13 +312,13 @@ spec:
{{- if $chart.Values.global.environment_variables }} {{- if $chart.Values.global.environment_variables }}
{{- range $index, $envvar := $chart.Values.global.environment_variables }} {{- range $index, $envvar := $chart.Values.global.environment_variables }}
- name: {{$envvar.name}} - name: {{$envvar.name}}
value: {{tpl ($envvar.value | toString) $chart }} value: {{tpl ($envvar.value | toString) $chart | quote }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if $deviceserver.environment_variables }} {{- if $deviceserver.environment_variables }}
{{- range $index, $envvar := $deviceserver.environment_variables }} {{- range $index, $envvar := $deviceserver.environment_variables }}
- name: {{$envvar.name}} - name: {{$envvar.name}}
value: {{tpl ($envvar.value | toString) $chart }} value: {{tpl ($envvar.value | toString) $chart | quote }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if not $chart.Values.do_not_constraint_resources }} {{- if not $chart.Values.do_not_constraint_resources }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment