Compare revisions

Pierre Smeyers · Pierre Smeyers · semantic-release-bot · Benguria Elguezabal, Gorka · semantic-release-bot · 8bd8ddc7
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
 include:
-  - project: 'to-be-continuous/tools/gitlab-ci'
+  - component: git.code.tecnalia.com/smartdatalab/public/ci-cd-components/gitlab-ci/extract@master
-    ref: 'master'
+    inputs:
-    file: '/templates/extract.yml'
+      extract-script-job-tags: ["docker"]
-  - project: 'to-be-continuous/tools/gitlab-ci'
+  - component: git.code.tecnalia.com/smartdatalab/public/ci-cd-components/gitlab-ci/validation@master
-    ref: 'master'
+    inputs:
-    file: '/templates/validation.yml'
+      check-links-job-tags: ["docker"]
-  - project: 'to-be-continuous/kicker'
+      tbc-check-job-tags: ["docker"]
-    ref: 'master'
+      tbc-check-image: cicd-docker-dev.artifact.tecnalia.com/tbc-check:master
-    file: '/templates/validation.yml'
+      gitlab-ci-lint-job-tags: ["docker"]
-  - project: 'to-be-continuous/bash'
+  - component: git.code.tecnalia.com/smartdatalab/public/ci-cd-components/kicker/validation@master
-    ref: '3.4'
+    inputs:
-    file: '/templates/gitlab-ci-bash.yml'
+      kicker-validation-job-tags: ["docker"]
-  - project: 'to-be-continuous/semantic-release'
+      schema-base-url: "https://git.code.tecnalia.com/api/v4/projects/smartdatalab%2Fpublic%2Fci-cd-components%2Fkicker/repository/files"
-    ref: '3.8'
+  - component: git.code.tecnalia.com/smartdatalab/public/ci-cd-components/bash/gitlab-ci-bash@master
-    file: '/templates/gitlab-ci-semrel.yml'
+    inputs:
+      bash-shellcheck-job-tags: ["docker"]
+  - component: git.code.tecnalia.com/smartdatalab/public/ci-cd-components/semantic-release/gitlab-ci-semrel@master
+    inputs:
+      semantic-release-job-tags: ["docker"]
 stages:
  - build

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+## [1.2.2](https://git.code.tecnalia.com/smartdatalab/public/ci-cd-components/renovate/compare/1.2.1...1.2.2) (2024-05-21)
+### Bug Fixes
+* **workflow:** disable MR pipeline from prod & integ branches ([e32e815](https://git.code.tecnalia.com/smartdatalab/public/ci-cd-components/renovate/commit/e32e815f6aa487edf0c25112cc6173bbd1ce0ad2))
+## [1.2.2](https://gitlab.com/to-be-continuous/renovate/compare/1.2.1...1.2.2) (2024-05-05)
+### Bug Fixes
+* **workflow:** disable MR pipeline from prod & integ branches ([e32e815](https://gitlab.com/to-be-continuous/renovate/commit/e32e815f6aa487edf0c25112cc6173bbd1ce0ad2))
 ## [1.2.1](https://gitlab.com/to-be-continuous/renovate/compare/1.2.0...1.2.1) (2024-2-5)

--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Add the following to your `gitlab-ci.yml`:
 ```yaml
 include:
  # include the component
-  - component: gitlab.com/to-be-continuous/renovate/gitlab-ci-renovate@1.2.1
+  - component: gitlab.com/to-be-continuous/renovate/gitlab-ci-renovate@1.2.2
 ```
 ### Use as a CI/CD template (legacy)
@@ -25,7 +25,7 @@ Add the following to your `gitlab-ci.yml`:
 include:
  # include the template
  - project: 'to-be-continuous/renovate'
-    ref: '1.2.1'
+    ref: '1.2.2'
    file: '/templates/gitlab-ci-renovate.yml'
 ```
@@ -39,6 +39,8 @@ The Renovate template uses some global configuration used throughout all jobs.
 | `platform` / `RENOVATE_PLATFORM` | The Platform type of repository [See doc](https://docs.renovatebot.com/self-hosted-configuration/#platform)  | `gitlab` |
 | :lock: `RENOVATE_TOKEN`| A GitLab access token to allow Renovate crawl your projects. [See doc](https://docs.renovatebot.com/modules/platform/gitlab/#authentication) | _none_ |
 | :lock: `GITHUB_COM_TOKEN`| A GitHub access token to allow Renovate fetch changelogs. [See doc](https://docs.renovatebot.com/getting-started/running/#githubcom-token-for-changelogs) | _none_ |
+| `renovate-validator-job-tags` / `RENOVATE_VALIDATOR_JOB_TAGS` | Tags to be used for selecting runners for the job | `[]`            |
+| `renovate-depcheck-job-tags` / `RENOVATE_DEPCHECK_JOB_TAGS` | Tags to be used for selecting runners for the job | `[]`            |
 This template will help you using [Renovate](https://www.mend.io/renovate/) from a GitLab project to
 automate your dependency updates within your groups or projects.

--- a/bumpversion.sh
+++ b/bumpversion.sh
@@ -33,7 +33,7 @@ if [[ "$curVer" ]]; then
  # replace in template and variants
  for tmpl in templates/*.yml
  do
-    sed -e "s/command: *\[\"--service\", \"\(.*\)\", \"$curVer\"\]/command: [\"--service\", \"\1\", \"$nextVer\"]/" "$tmpl" > "$tmpl.next"
+    sed -e "s/command: *\[ *\"--service\", *\"\(.*\)\", *\"$curVer\" *\]/command: [\"--service\", \"\1\", \"$nextVer\"]/" "$tmpl" > "$tmpl.next"
    mv -f "$tmpl.next" "$tmpl"
  done
 else

--- a/kicker.json
+++ b/kicker.json
@@ -25,6 +25,20 @@
      "name": "RENOVATE_PLATFORM",
      "description": "The Platform type of repository",
      "default": "gitlab"
+    },
+    {
+      "name": "RENOVATE_RENOVATE_VALIDATOR_JOB_TAGS",
+      "description": "Tags to be used for selecting runners for the job",
+      "type": "array",
+      "default": [],
+      "advanced": true
+    },
+    {
+      "name": "RENOVATE_RENOVATE_DEPCHECK_JOB_TAGS",
+      "description": "Tags to be used for selecting runners for the job",
+      "type": "array",
+      "default": [],
+      "advanced": true
    }
  ]
 }
--- a/templates/gitlab-ci-renovate.yml
+++ b/templates/gitlab-ci-renovate.yml
@@ -22,11 +22,22 @@ spec:
    platform:
      description: The Platform type of repository
      default: gitlab
+    renovate-validator-job-tags:
+      description: tags to filter applicable runners for renovate-validator job
+      default: []
+      type: array
+    renovate-depcheck-job-tags:
+      description: tags to filter applicable runners for renovate-depcheck job
+      default: []
+      type: array
 ---
 workflow:
  rules:
-    # prevent branch pipeline when an MR is open (prefer MR pipeline)
+    # prevent MR pipeline originating from production or integration branch(es)
-    - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS'
+    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ $PROD_REF || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ $INTEG_REF'
+      when: never
+    # on non-prod, non-integration branches: prefer MR pipeline over branch pipeline
+    - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_COMMIT_REF_NAME !~ $PROD_REF && $CI_COMMIT_REF_NAME !~ $INTEG_REF'
      when: never
    - if: '$CI_COMMIT_MESSAGE =~ "/\[(ci skip|skip ci) on ([^],]*,)*tag(,[^],]*)*\]/" && $CI_COMMIT_TAG'
      when: never
@@ -229,7 +240,7 @@ stages:
  image: $RENOVATE_IMAGE
  services:
    - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "renovate", "1.1.0" ]
+      command: ["--service", "renovate", "1.2.2"]
  variables:
    RENOVATE_BASE_DIR: $CI_PROJECT_DIR
    RENOVATE_CACHE_DIR: $CI_PROJECT_DIR/.cache/renovate
@@ -252,6 +263,7 @@ renovate-validator:
  dependencies: []
  script:
    - renovate-config-validator
+  tags: $[[ inputs.renovate-validator-job-tags ]]
 # dependency check job: on manual or schedule (dry-run otherwise)
 renovate-depcheck:
@@ -275,3 +287,4 @@ renovate-depcheck:
      variables:
        RENOVATE_DRY_RUN: "false"
    - if: $RENOVATE_TOKEN
+  tags: $[[ inputs.renovate-depcheck-job-tags ]]
No results found