diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75486c2aad2e7f102fea15dd48dbef023d323818..df7fe3e34db4add22617b9bab202bd88578a3071 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,9 +84,9 @@ push-merge-request-image-nexus: push-merge-request-helm-nexus: stage: publish - extends: - - .get-version - - .helm + before_script: + - !reference [.get-version, before_script] + - !reference [.helm, before_script] script: - helm package --version=${PROJECT_VERSION}-MR-${CI_MERGE_REQUEST_IID} src/main/helm - curl -u ${NEXUS_USER}:${NEXUS_PASSWORD} https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot -F file=@${PROJECT_ARTIFACTID}-MR-${CI_MERGE_REQUEST_IID}-${PROJECT_VERSION}.tgz @@ -97,9 +97,7 @@ push-merge-request-helm-nexus: # Snapshot jobs push-snapshot-image-gitlab: stage: publish - before_script: - - !reference [.get-version, before_script] - - !reference [.helm, before_script] + extends: .get-version script: - export IMAGE_TAGS="${CI_REGISTRY_IMAGE}:${PROJECT_VERSION}-main+${CI_COMMIT_SHORT_SHA},${CI_REGISTRY_IMAGE}:snapshot-latest" - mvn deploy -Pgitlab-deploy $MAVEN_DEPLOY_CLI_OPTS $MAVEN_CLI_OPTS