diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 23374de123ff8fcead586631b4ed6004124771d1..0625bb2ee3090c2b95e4cd06652ca35cfb10eb86 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -146,7 +146,9 @@ gitops-snapshot: variables: GITOPS_ENVIRONMENT: dev VALUES_FILE_NAME: afm-adapter-values.yaml + FORMSOLUTIONS_VALUES_FILE_NAME: fs-adapter-values.yaml VALUES_FILE: ${GITOPS_ENVIRONMENT}/application/values/${VALUES_FILE_NAME} + FS_VALUES_FILE: ${GITOPS_ENVIRONMENT}/application/values/${FORMSOLUTIONS_VALUES_FILE_NAME} before_script: - apk add --no-cache git yq # yq-go in newer versions of alpine (from 3.20 on) - git config --global user.name "${GITEA_USER}" @@ -157,7 +159,8 @@ gitops-snapshot: - cd gitops - yq -i ".afm_adapter.image.tag = \"${SNAPSHOT_TAG}-${CI_COMMIT_SHORT_SHA}\"" ${VALUES_FILE} - yq -i ".afm_adapter.helm.version = \"${PROJECT_VERSION}-main-${CI_COMMIT_SHORT_SHA}\"" ${VALUES_FILE} - - git add ${VALUES_FILE} + - yq -i ".fs_adapter.helm.version = \"${PROJECT_VERSION}-main-${CI_COMMIT_SHORT_SHA}\"" ${FS_VALUES_FILE} + - git add ${VALUES_FILE} ${FS_VALUES_FILE} - git commit -m "code-sh GitLab CI rollout ${environment} ${PROJECT_ARTIFACTID} version ${SNAPSHOT_TAG}-${CI_COMMIT_SHORT_SHA}" - git push https://${GITEA_USER}:${GITEA_TOKEN}@git.ozg-sh.de/ozgcloud-devops/gitops.git only: