Skip to content
Snippets Groups Projects
Commit 1b36eb25 authored by Ugur Yilmaz's avatar Ugur Yilmaz
Browse files

Merge branch 'st-1315-link-python' into 'master'

ST-1315: Link python3 to python and add missing jobs

See merge request ska-telescope/ska-tango-images!154
parents ae9ee80a 04a8de13
No related branches found
No related tags found
No related merge requests found
...@@ -52,7 +52,7 @@ before_script: ...@@ -52,7 +52,7 @@ before_script:
echo "Image to build: ${IMG}"; docker pull ${IMG} || true; 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=" --build-arg BUILD_IMAGE --build-arg BASE_IMAGE " - 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=" --build-arg BUILD_IMAGE --build-arg BASE_IMAGE "
.build_dependencies_rules: .tango-dependencies_rules:
rules: rules:
- if: '$CI_COMMIT_TAG' - if: '$CI_COMMIT_TAG'
- if: '$FORCE_REBUILD == "yes" || $FORCE_REBUILD == "build_1"' - if: '$FORCE_REBUILD == "yes" || $FORCE_REBUILD == "build_1"'
...@@ -60,16 +60,16 @@ before_script: ...@@ -60,16 +60,16 @@ before_script:
changes: changes:
- images/ska-tango-images-tango-dependencies/* - images/ska-tango-images-tango-dependencies/*
build_dependencies: build_tango-dependencies:
stage: build_1 stage: build_1
extends: extends:
- .image_builder_template - .image_builder_template
variables: variables:
OCI_IMAGE: ska-tango-images-tango-dependencies OCI_IMAGE: ska-tango-images-tango-dependencies
rules: rules:
- !reference [.build_dependencies_rules, rules] - !reference [.tango-dependencies_rules, rules]
.build_dependencies-alpine_rules: .tango-dependencies-alpine_rules:
rules: rules:
- if: '$CI_COMMIT_TAG' - if: '$CI_COMMIT_TAG'
- if: '$FORCE_REBUILD == "yes" || $FORCE_REBUILD == "build_1"' - if: '$FORCE_REBUILD == "yes" || $FORCE_REBUILD == "build_1"'
...@@ -77,7 +77,7 @@ build_dependencies: ...@@ -77,7 +77,7 @@ build_dependencies:
changes: changes:
- images/ska-tango-images-tango-dependencies-alpine/* - images/ska-tango-images-tango-dependencies-alpine/*
build_dependencies-alpine: build_tango-dependencies-alpine:
retry: 2 retry: 2
stage: build_1 stage: build_1
extends: extends:
...@@ -85,7 +85,7 @@ build_dependencies-alpine: ...@@ -85,7 +85,7 @@ build_dependencies-alpine:
variables: variables:
OCI_IMAGE: ska-tango-images-tango-dependencies-alpine OCI_IMAGE: ska-tango-images-tango-dependencies-alpine
rules: rules:
- !reference [.build_dependencies-alpine_rules, rules] - !reference [.tango-dependencies-alpine_rules, rules]
.build_tango-db-rules: .build_tango-db-rules:
rules: rules:
...@@ -600,6 +600,30 @@ build_tango-pytango: ...@@ -600,6 +600,30 @@ build_tango-pytango:
rules: rules:
- !reference [.tango-pytango-rules, rules] - !reference [.tango-pytango-rules, rules]
.tango-pytango-alpine-rules:
rules:
- if: '$CI_COMMIT_TAG'
- if: '$FORCE_REBUILD == "yes" || $FORCE_REBUILD == "build_5"'
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
changes:
- images/ska-tango-images-tango-dependencies-alpine/*
- images/ska-tango-images-tango-cpp-alpine/*
- images/ska-tango-images-pytango-builder-alpine/*
- images/ska-tango-images-pytango-runtime-alpine/*
- images/ska-tango-images-tango-pytango-alpine/*
build_tango-pytango-alpine:
retry: 2
stage: build_5
extends:
- .image_builder_template
variables:
OCI_IMAGE: ska-tango-images-tango-pytango-alpine
BUILD_IMAGE: ${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/ska-tango-images-pytango-builder-alpine
BASE_IMAGE: ${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/ska-tango-images-pytango-runtime-alpine
rules:
- !reference [.tango-pytango-alpine-rules, rules]
.tango-panic-rules: .tango-panic-rules:
rules: rules:
- if: '$CI_COMMIT_TAG' - if: '$CI_COMMIT_TAG'
...@@ -720,21 +744,21 @@ k8s-test-alpine: ...@@ -720,21 +744,21 @@ k8s-test-alpine:
- exists: - exists:
- tests/**/* - tests/**/*
scan_dependencies: scan_tango-dependencies:
extends: extends:
- .container-scanning - .container-scanning
variables: variables:
OCI_IMAGE: ska-tango-images-tango-dependencies OCI_IMAGE: ska-tango-images-tango-dependencies
rules: rules:
- !reference [.build_dependencies_rules, rules] - !reference [.tango-dependencies_rules, rules]
scan_dependencies-alpine: scan_tango-dependencies-alpine:
extends: extends:
- .container-scanning - .container-scanning
variables: variables:
OCI_IMAGE: ska-tango-images-tango-dependencies-alpine OCI_IMAGE: ska-tango-images-tango-dependencies-alpine
rules: rules:
- !reference [.build_dependencies-alpine_rules, rules] - !reference [.tango-dependencies-alpine_rules, rules]
scan_tango-db: scan_tango-db:
extends: extends:
...@@ -928,6 +952,14 @@ scan_tango-pytango: ...@@ -928,6 +952,14 @@ scan_tango-pytango:
rules: rules:
- !reference [.tango-pytango-rules, rules] - !reference [.tango-pytango-rules, rules]
scan_tango-pytango-alpine:
extends:
- .container-scanning
variables:
OCI_IMAGE: ska-tango-images-tango-pytango
rules:
- !reference [.tango-pytango-rules, rules]
scan_tango-panic: scan_tango-panic:
extends: extends:
- .container-scanning - .container-scanning
......
...@@ -58,4 +58,5 @@ RUN mkdir -p /etc/ld.so.conf.d \ ...@@ -58,4 +58,5 @@ RUN mkdir -p /etc/ld.so.conf.d \
# this was on the debian version # this was on the debian version
&& mkdir /venv \ && mkdir /venv \
&& ln -s /usr/* /venv/ \ && ln -s /usr/* /venv/ \
&& ln -s /usr/local/bin/itango3 /venv/bin/itango3 && ln -s /usr/local/bin/itango3 /venv/bin/itango3 \
&& ln -s /usr/bin/python3 /venv/bin/python
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment