diff --git a/continuousintegration/orchestration/helm/catalogue-updater/templates/pod.yaml b/continuousintegration/orchestration/helm/catalogue-updater/templates/pod.yaml index 9d900d60233ddbf78c64f3a0c67e7a32e3bf0af9..ffb7008f2e94fdde95975c6c4d8790904d9d7c22 100755 --- a/continuousintegration/orchestration/helm/catalogue-updater/templates/pod.yaml +++ b/continuousintegration/orchestration/helm/catalogue-updater/templates/pod.yaml @@ -56,15 +56,19 @@ spec: {{- include "common.extraEnv" . | nindent 4 }} {{- end }} volumeMounts: + {{- if .Values.customRepoFiles }} - name: yum-repos mountPath: /shared/etc_yum.repos.d + {{- end }} - name: catalogue-config mountPath: /shared/etc_cta/cta-catalogue.conf subPath: cta-catalogue.conf volumes: + {{- if .Values.customRepoFiles }} - name: yum-repos configMap: name: yum.repos.d-config + {{- end }} - name: catalogue-config configMap: name: cta-catalogue-conf diff --git a/continuousintegration/orchestration/helm/catalogue-updater/values.yaml b/continuousintegration/orchestration/helm/catalogue-updater/values.yaml index 503e935b2bc2902321203607c2b3f8cae63bbd9c..ed385b28687e1ff4e709489cf4318bf2a2860823 100644 --- a/continuousintegration/orchestration/helm/catalogue-updater/values.yaml +++ b/continuousintegration/orchestration/helm/catalogue-updater/values.yaml @@ -1,6 +1,6 @@ image: - repository: gitlab-registry.cern.ch/cta/eoscta-operations/registry/container_registry/cta-catalogue-updater - tag: "alma9-base.1" + repository: gitlab-registry.cern.ch/cta/public_registry/container_registry/cta-catalogue-updater + tag: "stable" pullPolicy: IfNotPresent pullSecrets: - ctaregsecret @@ -12,3 +12,6 @@ catalogueDestinationVersion: "" # Additional Extra environment variables extraEnv: + +# Set to true if you want to mount the configmap "yum.repos.d-config" +customRepoFiles: false diff --git a/continuousintegration/orchestration/tests/test_liquibase_update.sh b/continuousintegration/orchestration/tests/test_liquibase_update.sh index f5b800db0003faa0f93aa20e1385651a71d8c434..6dec7cee7ea029f862bc22ede1dd91ab56d9aace 100755 --- a/continuousintegration/orchestration/tests/test_liquibase_update.sh +++ b/continuousintegration/orchestration/tests/test_liquibase_update.sh @@ -82,6 +82,7 @@ kubectl -n ${NAMESPACE} create configmap yum.repos.d-config --from-file=${yum_re helm install catalogue-updater ../helm/catalogue-updater --namespace ${NAMESPACE} \ --set catalogueSourceVersion=$prev_catalogue_schema_version \ --set catalogueDestinationVersion=$catalogue_schema_version \ + --set customRepoFiles=true \ --wait --timeout 2m kubectl -n ${NAMESPACE} exec -it liquibase-update -- /bin/bash -c "/launch_liquibase.sh \"tag --tag=test_update\"" diff --git a/continuousintegration/validation/ci_input_validate.py b/continuousintegration/validation/ci_input_validate.py index e6aa253f886305cfc11806a0f9cb2071a931394d..2b2d970a0ad98109f203feb554978f2b632aba34 100644 --- a/continuousintegration/validation/ci_input_validate.py +++ b/continuousintegration/validation/ci_input_validate.py @@ -48,7 +48,7 @@ DEFINED_INPUT_VARS = [ "CUSTOM_EOS_TAG", "CUSTOM_CTA_TAG", "CTA_BUILD_ID", "CTA_PIPELINE_NAME", "GIT_STRATEGY", "GIT_SUBMODULE_STRATEGY", "GIT_DEPTH", "GIT_SUBMODULE_DEPTH", - "IMAGE_DOCKER_IMAGE_BUILDER", "IMAGE_CPPCHECK", + "IMAGE_DOCKER_IMAGE_BUILDER", "IMAGE_GITLAB_RELEASE_CLI", "IMAGE_BUILD", "IMAGE_TEST", "IMAGE_RELEASE", "IMAGE_ANALYSIS" ]