diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8dadb41884d614714a7d24b745b1565be72e96c5..f9616c4c970a6e5d1d10d65c7e997b076a8f938c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -699,7 +699,7 @@ k8s-test-alpine: - make k8s-install-chart IS_ALPINE="-alpine" CAR_OCI_REGISTRY_HOST=${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME} - make k8s-wait script: - - make k8s-test K8S_TEST_IMAGE_TO_TEST=${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/ska-tango-images-tango-itango-alpine:9.3.7 + - make k8s-test K8S_TEST_IMAGE_TO_TEST=${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/ska-tango-images-tango-itango-alpine:9.3.9 after_script: - echo $CI_JOB_NAME - $CI_JOB_STAGE - make k8s-uninstall-chart diff --git a/Makefile b/Makefile index b53e69ff82e81508b88dd1c27645f08315880539..c2c9f529780100eb1ce43a7d34c9e1682d6c8b32 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,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.7 ## TODO: UGUR docker image that will be run for testing purpose +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 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 diff --git a/images/ska-tango-images-tango-cpp-alpine/Dockerfile b/images/ska-tango-images-tango-cpp-alpine/Dockerfile index 46237303d13b1d60a13f8cae148c2d3c6ac48553..e929743849a2a4aedce7c50506500c0f80ef48ae 100644 --- a/images/ska-tango-images-tango-cpp-alpine/Dockerfile +++ b/images/ska-tango-images-tango-cpp-alpine/Dockerfile @@ -1,5 +1,5 @@ ARG CAR_OCI_REGISTRY_HOST -ARG BASE_IMAGE="alpine:3.14" +ARG BASE_IMAGE="alpine:3.15" ARG BUILD_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-dependencies-alpine:0.0.0" FROM $BUILD_IMAGE AS buildenv diff --git a/images/ska-tango-images-tango-db-alpine/Dockerfile b/images/ska-tango-images-tango-db-alpine/Dockerfile index 022854db31f6a711ccf1e88e99dc90c2f0dbc2f6..03787a2183de08c1106d882aa5a4ea1d174180c6 100644 --- a/images/ska-tango-images-tango-db-alpine/Dockerfile +++ b/images/ska-tango-images-tango-db-alpine/Dockerfile @@ -1,5 +1,5 @@ ARG CAR_OCI_REGISTRY_HOST -ARG BASE_IMAGE="alpine:3.14" +ARG BASE_IMAGE="alpine:3.15" ARG BUILD_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-cpp-alpine:0.0.0" FROM $BUILD_IMAGE AS buildenv diff --git a/images/ska-tango-images-tango-dependencies-alpine/Dockerfile b/images/ska-tango-images-tango-dependencies-alpine/Dockerfile index 0c81fb0be6a4560e238b22a3071c72042a056226..8d28d77e03415036a9258d4c5341521232de0b68 100644 --- a/images/ska-tango-images-tango-dependencies-alpine/Dockerfile +++ b/images/ska-tango-images-tango-dependencies-alpine/Dockerfile @@ -3,7 +3,7 @@ # intermediate image, then creates a release image containing the compiled # binaries. # -ARG BASE_IMAGE="alpine:3.14" +ARG BASE_IMAGE="alpine:3.15" FROM $BASE_IMAGE as buildenv # Install build time dependencies diff --git a/images/ska-tango-images-tango-rest-alpine/Dockerfile b/images/ska-tango-images-tango-rest-alpine/Dockerfile index 37637a50c9cc2c2e8a6807f16dccb648400a786d..45fed537158da572dcc721f69c773f8191905cde 100644 --- a/images/ska-tango-images-tango-rest-alpine/Dockerfile +++ b/images/ska-tango-images-tango-rest-alpine/Dockerfile @@ -1,5 +1,5 @@ ARG CAR_OCI_REGISTRY_HOST -ARG BUILD_IMAGE=alpine:3.14 +ARG BUILD_IMAGE=alpine:3.15 ARG BASE_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-java-alpine:0.0.0" FROM $BUILD_IMAGE AS buildenv