diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index f1e6035ec7a99a07a4516726f7fca4c83ec0ba14..747254c10ca787e6daef35a5556a5b6494823536 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,2 +1,2 @@
-FROM nexus.engageska-portugal.pt/ska-tango-images/pytango-builder:9.3.3.3 AS buildenv
+FROM artefact.skao.int/ska-tango-images-pytango-builder:9.3.10 AS buildenv
RUN apt-get update && apt-get install gnupg2 -y
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index dfe337ba06c14bda2b83c1e9819551d0a6d79d69..d9762a9bc37a88bc8de658dbd881e28fd1d09987 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -22,7 +22,7 @@
"davidanson.vscode-markdownlint",
"alexkrechik.cucumberautocomplete",
],
- "postCreateCommand": "python3 -m pip install -e /workspaces/ska-tango-base --extra-index-url https://nexus.engageska-portugal.pt/repository/pypi/simple",
+ "postCreateCommand": "python3 -m pip install -e /workspaces/ska-tango-base --extra-index-url https://artefact.skao.int/repository/pypi/simple",
"remoteUser": "tango",
"remoteEnv": {
"PATH": "/home/tango/.local/bin:${containerEnv:PATH}",
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3594565cb10e21e60ee06db8205bc2763f1c7d59..0daa56a881764fd231bd939677338df37a5ec2da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,7 @@
# GitLab CI in conjunction with GitLab Runner can use Docker Engine to test and build any application.
# Docker, when used with GitLab CI, runs each job in a separate and isolated container using the predefined image that is set up in .gitlab-ci.yml.
# In this case we use the latest python docker image to build and test this project.
-image: nexus.engageska-portugal.pt/ska-tango-images/pytango-builder:9.3.3.3
-
-include:
- - project: 'ska-telescope/templates-repository'
- file: 'gitlab-ci/includes/post_step.yml'
+image: artefact.skao.int/ska-tango-images-pytango-builder:9.3.10
# cache is used to specify a list of files and directories which should be cached between jobs. You can only use paths that are within the project workspace.
# If cache is defined outside the scope of jobs, it means it is set globally and all jobs will use that definition
@@ -34,37 +30,13 @@ clean shell runner:
# Gitlab CI badges creation
- rm -rf build/*
-build wheel for publication: # Executed on a tag
- stage: build
- tags:
- - k8srunner
- script:
- - python3 setup.py egg_info -b+$CI_COMMIT_SHORT_SHA sdist bdist_wheel
- rules:
- - if: '$CI_COMMIT_TAG'
- artifacts:
- paths:
- - ./dist/
-
-build wheel for development: # Executed on non-tagged commit
- stage: build
- tags:
- - k8srunner
- script:
- - python3 setup.py egg_info -b+dev.$CI_COMMIT_SHORT_SHA sdist bdist_wheel
- rules:
- - if: '$CI_COMMIT_TAG == null || $CI_COMMIT_TAG == ""'
- artifacts:
- paths:
- - ./dist/
-
unit tests:
stage: test
tags:
- k8srunner
script:
- echo $(ls -d ./dist/*.whl | grep $CI_COMMIT_SHORT_SHA)
- - python3 -m pip install --extra-index-url https://nexus.engageska-portugal.pt/repository/pypi/simple -U $(ls -d ./dist/*.whl | grep $CI_COMMIT_SHORT_SHA)
+ - python3 -m pip install --extra-index-url https://artefact.skao.int/repository/pypi-all/simple -U $(ls -d ./dist/*.whl | grep $CI_COMMIT_SHORT_SHA)
- make test
- scripts/validate-metadata.sh
artifacts:
@@ -77,44 +49,12 @@ linting:
- k8srunner
script:
- echo $(ls -d ./dist/*.whl | grep $CI_COMMIT_SHORT_SHA)
- - python3 -m pip install --extra-index-url https://nexus.engageska-portugal.pt/repository/pypi/simple -U $(ls -d ./dist/*.whl | grep $CI_COMMIT_SHORT_SHA)
+ - python3 -m pip install --extra-index-url https://artefact.skao.int/repository/pypi-all/simple -U $(ls -d ./dist/*.whl | grep $CI_COMMIT_SHORT_SHA)
- make lint
artifacts:
paths:
- ./build
-publish to nexus:
- stage: publish
- tags:
- - k8srunner
- variables:
- TWINE_USERNAME: $TWINE_USERNAME
- TWINE_PASSWORD: $TWINE_PASSWORD
- script:
- # check metadata requirements
- - scripts/validate-metadata.sh
- - python3 -m pip install twine
- - twine upload --repository-url $PYPI_REPOSITORY_URL dist/*
- rules:
- # PyPI package release only on tags, and confirm semantic versioning of tag
- - if: '$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)$/'
-
-release docker image:
- stage: release
- image: nexus.engageska-portugal.pt/ska-docker/tango-builder:latest
- before_script:
- - docker login -u $DOCKER_REGISTRY_USERNAME -p $DOCKER_REGISTRY_PASSWORD $DOCKER_REGISTRY_HOST
- tags:
- - k8srunner
- script:
- - make build
- - make push
- rules:
- # Images only allow manual run on tags, and confirm semantic versioning of tag
- - if: '$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)$/'
- when: manual
- allow_failure: true
-
pages:
stage: pages
tags:
@@ -128,4 +68,17 @@ pages:
- public
only:
- master
-
\ No newline at end of file
+
+include:
+ # Create Gitlab CI badges from CI metrics
+ # https://developer.skatelescope.org/en/latest/tools/continuousintegration.html#automated-collection-of-ci-health-metrics-as-part-of-the-ci-pipeline
+ - project: 'ska-telescope/templates-repository'
+ file: 'gitlab-ci/includes/post_step.yml'
+ # Publish Python packages
+ # https://developer.skao.int/en/latest/tools/software-package-release-procedure.html#building-and-publishing-python-packages
+ - project: 'ska-telescope/templates-repository'
+ file: 'gitlab-ci/includes/build_wheel.yml'
+ # Publish OCI images
+ # https://developer.skao.int/en/latest/tools/software-package-release-procedure.html#oci-image
+ - project: 'ska-telescope/templates-repository'
+ file: 'gitlab-ci/includes/build_push.yml'
diff --git a/.make/Makefile.mk b/.make/Makefile.mk
index 54d3ebda246827dce2817367be05a3ab4f184f38..5dc714bd24fd41747687518e8ac55e2c2ab2e39f 100644
--- a/.make/Makefile.mk
+++ b/.make/Makefile.mk
@@ -21,15 +21,11 @@ endif
RELEASE_SUPPORT := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))/.make-release-support
-ifeq ($(strip $(DOCKER_REGISTRY_HOST)),)
- DOCKER_REGISTRY_HOST = nexus.engageska-portugal.pt
+ifeq ($(strip $(CAR_OCI_REGISTRY_HOST)),)
+ CAR_OCI_REGISTRY_HOST = artefact.skao.int
endif
-ifeq ($(strip $(DOCKER_REGISTRY_USER)),)
- DOCKER_REGISTRY_USER = ska-telescope
-endif
-
-IMAGE=$(DOCKER_REGISTRY_HOST)/$(DOCKER_REGISTRY_USER)/$(NAME)
+IMAGE=$(CAR_OCI_REGISTRY_HOST)/$(NAME)
VERSION=$(shell . $(RELEASE_SUPPORT) ; getVersion)
TAG=$(shell . $(RELEASE_SUPPORT); getTag)
@@ -53,7 +49,7 @@ pre-push:
post-push:
docker-build: .release
- docker build $(DOCKER_BUILD_ARGS) -t $(IMAGE):$(VERSION) $(DOCKER_BUILD_CONTEXT) -f $(DOCKER_FILE_PATH) --build-arg DOCKER_REGISTRY_HOST=$(DOCKER_REGISTRY_HOST) --build-arg DOCKER_REGISTRY_USER=$(DOCKER_REGISTRY_USER) --build-arg IMAGE_VERSION=$(VERSION)
+ docker build $(DOCKER_BUILD_ARGS) -t $(IMAGE):$(VERSION) $(DOCKER_BUILD_CONTEXT) -f $(DOCKER_FILE_PATH) --build-arg CAR_OCI_REGISTRY_HOST=$(CAR_OCI_REGISTRY_HOST) --build-arg IMAGE_VERSION=$(VERSION)
@DOCKER_MAJOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f1) ; \
DOCKER_MINOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f2) ; \
if [ $$DOCKER_MAJOR -eq 1 ] && [ $$DOCKER_MINOR -lt 10 ] ; then \
diff --git a/.release b/.release
index 3cdbac45f73bd3b082113855510e10a205f3a222..870d4a216d695e5e6c4a41f5fa45d691c0b0529b 100644
--- a/.release
+++ b/.release
@@ -1,2 +1,2 @@
-release=0.11.2
-tag=ska_tango_base-0.11.2
+release=0.11.3
+tag=ska-tango-base-0.11.3
diff --git a/Dockerfile b/Dockerfile
index 00b73e381dd2c9a6aee2f28912e9edb0574fe218..3759c0e7815ecab8d7de49711ddc396016f373d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
# Use SKA python image as base image
-FROM nexus.engageska-portugal.pt/ska-tango-images/pytango-builder:9.3.3.3 AS buildenv
-FROM nexus.engageska-portugal.pt/ska-tango-images/pytango-runtime:9.3.3.3 AS runtime
+FROM artefact.skao.int/ska-tango-images-pytango-builder:9.3.10 AS buildenv
+FROM artefact.skao.int/ska-tango-images-pytango-runtime:9.3.10 AS runtime
ARG IMAGE_VERSION=0.0.1
diff --git a/Makefile b/Makefile
index cedc8f3996d8b4ad59712431daa434c52ef02c32..71c5d78696a38250016db663d87d7aae4c34051e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
#
# Project makefile for a SKA Tango Base project. You should normally only need to modify
-# DOCKER_REGISTRY_USER and PROJECT below.
+# PROJECT below.
# Use bash shell with pipefail option enabled so that the return status of a
# piped command is the value of the last (rightmost) command to exit with a
@@ -9,15 +9,12 @@
SHELL = /bin/bash
.SHELLFLAGS = -o pipefail -c
-# DOCKER_REGISTRY_HOST, DOCKER_REGISTRY_USER and PROJECT are combined to define
+# CAR_OCI_REGISTRY_HOST, and PROJECT are combined to define
# the Docker tag for this project. The definition below inherits the standard
-# value for DOCKER_REGISTRY_HOST (=rnexus.engageska-portugal.pt) and overwrites
-# DOCKER_REGISTRY_USER and PROJECT to give a final Docker tag of
-# nexus.engageska-portugal.pt/ska-telescope/ska_tango_base
-#
-DOCKER_REGISTRY_USER:=ska-telescope
-PROJECT = ska_tango_base
-IMAGE_FOR_DIAGRAMS = nexus.engageska-portugal.pt/ska-tango-images/pytango-builder:9.3.3.3
+# value for CAR_OCI_REGISTRY_HOST (=artefact.skao.int) and overwrites
+# PROJECT to give a final Docker tag of artefact.skao.int/ska-tango-base
+PROJECT = ska-tango-base
+IMAGE_FOR_DIAGRAMS = artefact.skao.int/ska-tango-images-pytango-builder:9.3.10
# import some standard Make targets e.g. `make build` (for building
diff --git a/README.md b/README.md
index 11528518e02e7817ab860944cb46f0bdf3afe6bd..29d6d7eba0e7cdf005f05ce159cb96ebd48c4d31 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ The requirements for testing are:
#### Installation steps
1. Clone the repository on local machine.
2. Navigate to the root directory of the repository from terminal
-3. Run 'python3 -m pip install . --extra-index-url https://nexus.engageska-portugal.pt/repository/pypi/simple'
+3. Run 'python3 -m pip install . --extra-index-url https://artefact.skao.int/repository/pypi/simple'
### Testing
The project can be tested locally my invoking *make CI_JOB_ID=some_id test* command. This invokes a chain of commands from the makefile which builds the project's python package, creates a docker image with the project, instantiates separate container for each of the base class and runs unit test cases of each class. Additionally, code analysis is also done and code coverage report is prepared. After testing is done, the containers are taken down.
@@ -61,7 +61,7 @@ class DishLeafNode(SKABaseDevice):
#### PyCharm
-The Docker integration is recommended. For development, use the `nexus.engageska-portugal.pt/ska-telescope/ska_tango_base:latest` image as the Python Interpreter for the project. Note that if `make` is run with targets like `build`, `up`, or `test`, that image will be rebuilt by Docker using the local code, and tagged as `latest`.
+The Docker integration is recommended. For development, use the `artefact.skao.int/ska-tango-base:latest` image as the Python Interpreter for the project. Note that if `make` is run with targets like `build`, `up`, or `test`, that image will be rebuilt by Docker using the local code, and tagged as `latest`.
As this project uses a `src` [folder structure](https://blog.ionelmc.ro/2014/05/25/python-packaging/#the-structure), so under _Preferences > Project Structure_, the `src` folder needs to be marked as "Sources". That will allow the interpreter to be aware of the package from folders like `tests` that are outside of `src`. When adding Run/Debug configurations, make sure "Add content roots to PYTHONPATH" and "Add source roots to PYTHONPATH" are checked.
@@ -247,6 +247,9 @@ Tango devices can be launched with a `-v` parameter to set the logging level. Fo
## Version History
+#### 0.11.3
+- No change, moving artefacts to a new repository https://artefact.skao.int/.
+
#### 0.11.2
- Update docstrings for 100% coverage and PEP257 compliance
diff --git a/docs/source/guide/getting_started.rst b/docs/source/guide/getting_started.rst
index 0a7c21a228fff047afa3ee60b4de00807bca791b..b56756c07619f571f6be4c52cd540d5d3e498e19 100644
--- a/docs/source/guide/getting_started.rst
+++ b/docs/source/guide/getting_started.rst
@@ -12,7 +12,7 @@ installed from the EngageSKA Nexus repository:
.. code-block:: shell-session
- me@local:~$ python3 -m pip install --extra-index-url https://nexus.engageska-portugal.pt/repository/pypi/simple ska-tango-base
+ me@local:~$ python3 -m pip install --extra-index-url https://artefact.skao.int/repository/pypi/simple ska-tango-base
Basic steps
-----------
diff --git a/src/ska_tango_base/release.py b/src/ska_tango_base/release.py
index 5b59b1511b2ee54edfd2e0c876522a9ed42c3eb7..59fcb2385584422567436203e9bd0f711ddd6e02 100644
--- a/src/ska_tango_base/release.py
+++ b/src/ska_tango_base/release.py
@@ -7,7 +7,7 @@
"""Release information for ska_tango_base Python Package."""
name = """ska_tango_base"""
-version = "0.11.2"
+version = "0.11.3"
version_info = version.split(".")
description = """A set of generic base devices for SKA Telescope."""
author = "SKA India and SARAO and CSIRO and INAF"