Skip to content

Commit 75b3ca0

Browse files
committed
Increase version of GitLab CI component for helm
1 parent e99d00b commit 75b3ca0

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

.gitlab-ci.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ variables:
33
GIT_CLEAN_FLAGS: "-ffdx"
44
# Change pip's cache directory to be inside the project directory since we can only cache local items.
55
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
6+
EXTRA_VALUES: '--values ./secrets/config/common/common.yaml --values ./secrets/config/common/cryptnono.yaml --values ./secrets/config/common/gesis.yaml --values ./config/gesis-acceptance.yml --values ./secrets/config/gesis-acceptance.yaml'
67

78
# This workflow:rules are required to enable merge request pipelines!
89
workflow:
@@ -47,21 +48,23 @@ build helm chart:
4748
- mybinder/values.yaml
4849

4950
include:
50-
- component: $CI_SERVER_FQDN/rse/docker/images/helm/helm-lint@1.0.2
51+
- component: $CI_SERVER_FQDN/rse/docker/images/helm/helm-lint@1.1.5
5152
inputs:
5253
stage: lint
5354
dir: mybinder
55+
extra_values: ${EXTRA_VALUES}
56+
git_crypt: 'true'
5457
rules:
5558
- if: $CI_SERVER_FQDN == "git.gesis.org" && $CI_PIPELINE_SOURCE == 'merge_request_event'
5659
- if: $CI_SERVER_FQDN == "git.gesis.org" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
5760

58-
- component: $CI_SERVER_FQDN/rse/docker/images/helm/helm-deploy@1.0.2
61+
- component: $CI_SERVER_FQDN/rse/docker/images/helm/helm-deploy@1.1.5
5962
inputs:
6063
stage: deploy-acceptance-helm
6164
environment: acceptance
6265
dir: mybinder
63-
k8s_context: acceptance
64-
extra_values: '--values ./config/gesis-acceptance.yml --values ./secrets/config/common/common.yaml --values ./secrets/config/common/cryptnono.yaml --values ./secrets/config/common/gesis.yaml --values secrets/config/gesis-acceptance.yaml'
66+
k8s_context: methods-hub/binder.methodshub.gesis.org:acceptance
67+
extra_values: ${EXTRA_VALUES}
6568
git_crypt: 'true'
6669
rules:
6770
- if: $CI_SERVER_FQDN == "git.gesis.org" && $CI_PIPELINE_SOURCE == 'merge_request_event'

0 commit comments

Comments
 (0)