From 18d87498a7382978eff2bb9137a2fc36f49e7e19 Mon Sep 17 00:00:00 2001
From: Lukas Malte Monnerjahn <lukasmalte.monnerjahn@dataport.de>
Date: Wed, 22 Jan 2025 11:59:08 +0100
Subject: [PATCH] reset job activation rules
---
.gitlab-ci.yml | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a9b6007c..23374de1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,13 +35,11 @@ test:
stage: test
script:
- mvn test $MAVEN_CLI_OPTS
- when: manual # disabled for faster testing
verify:
stage: test
script:
- mvn verify $MAVEN_CLI_OPTS
- when: manual # disabled for faster testing
test-helm:
stage: test
@@ -50,7 +48,6 @@ test-helm:
- helm plugin install https://github.com/helm-unittest/helm-unittest.git
script:
- ./run_helm_test.sh
- when: manual # disabled for faster testing
.get-version:
before_script:
@@ -123,8 +120,8 @@ push-snapshot-image-nexus:
script:
- export IMAGE_TAGS="${NEXUS_IMAGE_PREFIX}:${SNAPSHOT_TAG},${NEXUS_IMAGE_PREFIX}:${SNAPSHOT_TAG}-${CI_COMMIT_SHORT_SHA},${NEXUS_IMAGE_PREFIX}:snapshot-latest"
- mvn deploy -Pnexus-deploy $MAVEN_DEPLOY_CLI_OPTS $MAVEN_CLI_OPTS
- # only:
- # - main # enabled for testing
+ only:
+ - main
push-snapshot-helm-nexus:
stage: publish
@@ -138,8 +135,8 @@ push-snapshot-helm-nexus:
- !reference [ .publish-helm-chart, script ]
- export HELM_CHART_VERSION=${PROJECT_VERSION}-main-${CI_COMMIT_SHORT_SHA}
- !reference [.publish-helm-chart, script]
- #only:
- # - main # enabled for testing
+ only:
+ - main
artifacts:
paths:
- "*.tgz"
@@ -147,15 +144,13 @@ push-snapshot-helm-nexus:
gitops-snapshot:
stage: gitops
variables:
- GIT_NAME: gitlab-ci
- GIT_EMAIL: noreply@ozg-sh.de
GITOPS_ENVIRONMENT: dev
VALUES_FILE_NAME: afm-adapter-values.yaml
VALUES_FILE: ${GITOPS_ENVIRONMENT}/application/values/${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 "${GIT_NAME}"
- - git config --global user.email "${GIT_EMAIL}"
+ - git config --global user.name "${GITEA_USER}"
+ - git config --global user.email "${GITEA_USER_EMAIL}"
- !reference [.get-version, before_script]
script:
- git clone https://${GITEA_USER}:${GITEA_TOKEN}@git.ozg-sh.de/ozgcloud-devops/gitops.git
@@ -165,8 +160,8 @@ gitops-snapshot:
- git add ${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:
- # - main # enabled for testing
+ only:
+ - main
# Release jobs
push-release-image-gitlab:
--
GitLab