From 6eb928abb6dd773a5013fac3bea37f9e4a3d8f08 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Tue, 10 Dec 2024 13:12:25 +0100
Subject: [PATCH] #2 OZG-7121 pipeline: Adjust references for helm
---
.gitlab-ci.yml | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75486c2..df7fe3e 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
--
GitLab