From c40c0044a2a6746f8707c1692a642ed83ea2eca7 Mon Sep 17 00:00:00 2001
From: Nacho Barrientos <nacho.barrientos@cern.ch>
Date: Tue, 11 Mar 2025 14:56:39 +0100
Subject: [PATCH 1/4] Actually run these jobs when they have to
If "rules:" is present and no rules are evaluated true then the job is
not added to the pipeline. The current configuration was correctly
omitting the jobs in tags however there was nothing configuring them
to run otherwise (!). This commit fixes that. On a tag the first rule
will be evaluated true and, thanks to "when: never", the job won't be
added as expected, ignoring the rest.
---
.gitlab-ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ebd77d..8e1999f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,7 @@ docs_lint:
rules:
- if: '$CI_COMMIT_TAG'
when: never
+ - if: $CI_PIPELINE_SOURCE == "push"
script:
- dnf install -y python-pip
- python3 -m pip install linkcheckmd
@@ -27,6 +28,7 @@ yaml_lint:
rules:
- if: '$CI_COMMIT_TAG'
when: never
+ - if: $CI_PIPELINE_SOURCE == "push"
script:
- dnf install -y epel-release
- dnf install -y yamllint
--
GitLab
From 9f5386995cc2bf15a2a6fc06c25018210f45f860 Mon Sep 17 00:00:00 2001
From: Nacho Barrientos <nacho.barrientos@cern.ch>
Date: Tue, 11 Mar 2025 15:03:42 +0100
Subject: [PATCH 2/4] Fix linkcheckmd invocation for a directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Before the patch:
λ python3 -m linkcheckmd -v docs/*
__main__.py: error: unrecognized arguments: ./docs/metrics.md ./docs/values.md
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e1999f..1f74bfc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ docs_lint:
- dnf install -y python-pip
- python3 -m pip install linkcheckmd
- python3 -m linkcheckmd -v README.md
- - python3 -m linkcheckmd -v docs/*
+ - python3 -m linkcheckmd -v docs
yaml_lint:
stage: lint
--
GitLab
From 04f327b936057b0fcaf26b388793f0a0f947a447 Mon Sep 17 00:00:00 2001
From: Nacho Barrientos <nacho.barrientos@cern.ch>
Date: Tue, 11 Mar 2025 15:06:13 +0100
Subject: [PATCH 3/4] Ignore CRDs when YAML-checking
---
.yamllint | 1 +
1 file changed, 1 insertion(+)
diff --git a/.yamllint b/.yamllint
index 0fe8361..2c675e0 100644
--- a/.yamllint
+++ b/.yamllint
@@ -4,3 +4,4 @@ rules:
spaces: 2
ignore:
- templates/*
+ - charts/crds/crds/*
--
GitLab
From 417adebf1305f3596b22e14488e407bc5459c661 Mon Sep 17 00:00:00 2001
From: Nacho Barrientos <nacho.barrientos@cern.ch>
Date: Tue, 11 Mar 2025 15:08:48 +0100
Subject: [PATCH 4/4] Fix YAML file indentation
---
Chart.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Chart.yaml b/Chart.yaml
index a557304..c51e87c 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -6,6 +6,6 @@ kubeVersion: ">=1.27.0-0"
description: Helm Chart provided by IT Monitoring Service to install and configure required components to gather and send monitoring data from kubernetes clusters to central service.
home: https://cern.ch/monitoring
dependencies:
-- name: crds
- version: "0.0.0"
- condition: crds.enabled
+ - name: crds
+ version: "0.0.0"
+ condition: crds.enabled
--
GitLab