From e62b2950312e877255b76f30a8e3d52455b4a6f2 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Mon, 26 Sep 2022 01:17:30 +0200
Subject: [PATCH] ci(charts): Reorder CI steps
This patch reorders CI steps and adjusts some names. It also adjusts the
exists rule, which doesn't seem to trigger as expected.
---
.gitlab-ci.yml | 2 +-
charts/.utils/gitlab-ci.yaml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2edd2c12a..0b997067c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,8 @@ include:
- local: 'images/.utils/gitlab-ci.yaml'
- local: 'charts/.utils/gitlab-ci.yaml'
stages:
+ - lint
- build
- - test
- changelog
- release
diff --git a/charts/.utils/gitlab-ci.yaml b/charts/.utils/gitlab-ci.yaml
index 0801e34c5..46ab14fb5 100644
--- a/charts/.utils/gitlab-ci.yaml
+++ b/charts/.utils/gitlab-ci.yaml
@@ -5,7 +5,7 @@
- keycloak
- mok
-chart-build-keycloak:
+chart-package:
stage: build
extends: .chart-matrix
image: quay.io/helmpack/chart-testing:v3.6.0
@@ -19,7 +19,7 @@ chart-build-keycloak:
- charts/${CHART}/Chart.yaml
chart-helm-unittest:
- stage: test
+ stage: lint
extends: .chart-matrix
image:
name: docker.io/quintush/helm-unittest:3.10.0-0.2.9
@@ -36,4 +36,4 @@ chart-helm-unittest:
changes:
- charts/${CHART}/**/*
exists:
- - charts/${CHART}/tests/
+ - charts/${CHART}/tests/**/*
--
GitLab