feat(gitea): add script to facilitate package upload on gitea

2023-08-22 18:46:48 -06:00
9 changed files with 71 additions and 244 deletions
--- a/resources/com/cadoles/common/add-letsencrypt-ca.sh
+++ b/resources/com/cadoles/common/add-letsencrypt-ca.sh
@ -27,8 +27,6 @@ https://letsencrypt.org/certs/lets-encrypt-r3.pem
 https://letsencrypt.org/certs/lets-encrypt-e1.pem
 https://letsencrypt.org/certs/lets-encrypt-r4.pem
 https://letsencrypt.org/certs/lets-encrypt-e2.pem
-https://letsencrypt.org/certs/2024/r10.pem
-https://letsencrypt.org/certs/2024/r11.pem
 EOF
 )"

--- a/resources/com/cadoles/gitea/gitea-download.sh
+++ b/resources/com/cadoles/gitea/gitea-download.sh
@ -5,7 +5,6 @@ set -eo pipefail
 GITEA_DOWNLOAD_PROJECT=${GITEA_DOWNLOAD_PROJECT}
 GITEA_DOWNLOAD_ORG=${GITEA_DOWNLOAD_ORG}
 GITEA_DOWNLOAD_BASE_URL=${GITEA_BASE_URL:-https://forge.cadoles.com}
-GITEA_DOWNLOAD_ANONYMOUS=${GITEA_DOWNLOAD_ANONYMOUS:-no}
 GITEA_DOWNLOAD_USERNAME=${GITEA_DOWNLOAD_USERNAME}
 GITEA_DOWNLOAD_PASSWORD=${GITEA_DOWNLOAD_PASSWORD}
 GITEA_DOWNLOAD_RELEASE_NAME=${GITEA_DOWNLOAD_RELEASE_NAME:-latest}
@ -53,10 +52,6 @@ function assert_environment {
 }

 function ask_credentials {
-    if [ "${GITEA_DOWNLOAD_ANONYMOUS}" == "yes" ]; then
-        return
-    fi
-
    if [ -z "$GITEA_DOWNLOAD_USERNAME" ]; then
        echo -n "Username: "
        read GITEA_DOWNLOAD_USERNAME
@ -109,14 +104,11 @@ function gitea_api {
    local path=$1
    local args=${@:2}

-    if [ "${GITEA_DOWNLOAD_ANONYMOUS}" != 'yes' ]; then
-        args="-u "$GITEA_DOWNLOAD_USERNAME:$GITEA_DOWNLOAD_PASSWORD" ${args}"
-    fi
-
    curl -L \
        --fail \
        --ipv4 \
        -k \
+        -u "$GITEA_DOWNLOAD_USERNAME:$GITEA_DOWNLOAD_PASSWORD" \
        ${args} \
        "$GITEA_DOWNLOAD_BASE_URL/api/v1$path"
 }
@ -125,14 +117,11 @@ function gitea_download {
    local attachment_id=$1
    local output=$2

-    if [ "${GITEA_DOWNLOAD_ANONYMOUS}" != 'yes' ]; then
-        GITEA_DOWNLOAD_CURL_ARGS="-u "$GITEA_DOWNLOAD_USERNAME:$GITEA_DOWNLOAD_PASSWORD" ${GITEA_DOWNLOAD_CURL_ARGS}"
-    fi
-
    curl -L \
        --fail \
        --ipv4 \
        -k \
+        -u "$GITEA_DOWNLOAD_USERNAME:$GITEA_DOWNLOAD_PASSWORD" \
        --output "$output" \
        $GITEA_DOWNLOAD_CURL_ARGS \
        "$GITEA_DOWNLOAD_BASE_URL/attachments/$attachment_id"
--- a/resources/com/cadoles/gitea/gitea-package.sh
+++ b/resources/com/cadoles/gitea/gitea-package.sh
@ -2,22 +2,17 @@

 set -eo pipefail

-GITEA_PACKAGE_ORG=${GITEA_PACKAGE_ORG}
 GITEA_PACKAGE_BASE_URL=${GITEA_BASE_URL:-https://forge.cadoles.com}
 GITEA_PACKAGE_USERNAME=${GITEA_PACKAGE_USERNAME}
 GITEA_PACKAGE_PASSWORD=${GITEA_PACKAGE_PASSWORD}
-GITEA_PACKAGE_FILE=${GITEA_PACKAGE_FILE}
+GITEA_PACKAGE_OWNER=${GITEA_PACKAGE_OWNER}
+GITEA_PACKAGE_FILES=${GITEA_PACKAGE_FILES}
 GITEA_PACKAGE_CURL_MAX_RETRY=${GITEA_PACKAGE_CURL_MAX_RETRY:-3}
-GITEA_PACKAGE_FORCE_OVERWRITE=${GITEA_PACKAGE_FORCE_UPLOAD:-yes}
-
-GITEA_PACKAGE_DEBIAN_DISTRIBUTION=${GITEA_PACKAGE_DEBIAN_DISTRIBUTION:-latest}
-GITEA_PACKAGE_DEBIAN_COMPONENT=${GITEA_PACKAGE_DEBIAN_COMPONENT:-main}
-
-GITEA_PACKAGE_ALPINE_BRANCH=${GITEA_PACKAGE_ALPINE_BRANCH:-latest}
-GITEA_PACKAGE_ALPINE_REPOSITORY=${GITEA_PACKAGE_ALPINE_REPOSITORY:-main}
+GITEA_PACKAGE_TYPE=${GITEA_PACKAGE_TYPE:-generic}

 function check_dependencies {
    assert_command_available 'curl'
+    assert_command_available 'jq'
 }

 function assert_command_available {
@ -31,8 +26,9 @@ function assert_command_available {
 }

 function check_environment {
-    assert_environment GITEA_PACKAGE_ORG
    assert_environment GITEA_PACKAGE_BASE_URL
+    assert_environment GITEA_PACKAGE_FILES
+    assert_environment GITEA_PACKAGE_OWNER
 }

 function source_env_file {
@ -69,56 +65,48 @@ function ask_credentials {
    fi
 }

-function ask_package_type {
-    local available_types="debian alpine redhat"
-    local match=$( ( echo "$available_types" | grep -qw "$GITEA_PACKAGE_TYPE" ) && echo yes || echo no )
-    while [ "$match" == "no" ] || [ -z $GITEA_PACKAGE_TYPE ]; do
-        echo -n "Package type ($available_types): "
-        read GITEA_PACKAGE_TYPE
-        match=$( ( echo "$available_types" | grep -qw "$GITEA_PACKAGE_TYPE" ) && echo yes || echo no )
-    done
+function upload_package {
+    echo "Uploading package(s)..."
+    case "$GITEA_PACKAGE_TYPE" in
+        generic)
+            upload_generic_package
+            ;;
+        alpine)
+            upload_alpine_package
+            ;;
+        *)
+            echo "Unknown package type '$GITEA_PACKAGE_TYPE'. Please check $"$GITEA_PACKAGE_TYPE" environment variable value." 1>&2
+            exit 1
+    esac
+    echo "Done"
 }

-function ask_package_file {
-    while [ ! -f "$GITEA_PACKAGE_FILE" ]; do
-        echo -n "Package file (must be a valid path to a supported package file): "
-        read GITEA_PACKAGE_FILE
+function upload_generic_package {
+    assert_environment GITEA_PACKAGE_GENERIC_PACKAGE_NAME
+    assert_environment GITEA_PACKAGE_GENERIC_PACKAGE_VERSION
+
+    for f in $GITEA_PACKAGE_FILES; do
+        local filename=$(basename $f)
+        echo "Uploading file '$f' as generic package $GITEA_PACKAGE_OWNER/$GITEA_PACKAGE_GENERIC_PACKAGE_NAME/$GITEA_PACKAGE_GENERIC_PACKAGE_VERSION..."
+        gitea_api "/api/packages/$GITEA_PACKAGE_OWNER/generic/$GITEA_PACKAGE_GENERIC_PACKAGE_NAME/$GITEA_PACKAGE_GENERIC_PACKAGE_VERSION/$filename" \
+            -X PUT \
+            --upload-file "$f"
    done
-
-    if [ -z $GITEA_PACKAGE_TYPE ]; then
-        local filename=$(basename -- "$GITEA_PACKAGE_FILE")
-        local extension="${filename##*.}"
-
-        case $extension in
-            deb)
-                GITEA_PACKAGE_TYPE=debian
-            ;;
-            apk)
-                GITEA_PACKAGE_TYPE=alpine
-            ;;
-            rpm)
-                GITEA_PACKAGE_TYPE=redhat
-            ;;
-        esac
-    fi
-}
-
-function upload_debian_package {
-    gitea_api "/api/packages/$GITEA_PACKAGE_ORG/debian/pool/$GITEA_PACKAGE_DEBIAN_DISTRIBUTION/$GITEA_PACKAGE_DEBIAN_COMPONENT/upload" \
-        --upload-file "$GITEA_PACKAGE_FILE"
 }

 function upload_alpine_package {
-    gitea_api "/api/packages/$GITEA_PACKAGE_ORG/alpine/$GITEA_PACKAGE_ALPINE_BRANCH/$GITEA_PACKAGE_ALPINE_REPOSITORY" \
-        --upload-file "$GITEA_PACKAGE_FILE"
-}
+    assert_environment GITEA_PACKAGE_ALPINE_PACKAGE_BRANCH
+    assert_environment GITEA_PACKAGE_ALPINE_PACKAGE_REPOSITORY

-function upload_redhat_package {
-    gitea_api "/api/packages/$GITEA_PACKAGE_ORG/rpm/upload" \
-        --upload-file "$GITEA_PACKAGE_FILE"
+    for f in $GITEA_PACKAGE_FILES; do
+        local filename=$(basename $f)
+        echo "Uploading file '$f' as alpine package $GITEA_PACKAGE_OWNER/$GITEA_PACKAGE_ALPINE_PACKAGE_BRANCH/$GITEA_PACKAGE_ALPINE_PACKAGE_REPOSITORY..."
+        gitea_api "/api/packages/$GITEA_PACKAGE_OWNER/alpine/$GITEA_PACKAGE_ALPINE_PACKAGE_BRANCH/$GITEA_PACKAGE_ALPINE_PACKAGE_REPOSITORY" \
+            -X PUT \
+            --upload-file "$f"
+    done
 }

-
 function gitea_api {
    local path=$1
    local args=${@:2}
@ -139,23 +127,7 @@ function main {
    source_env_file
    check_environment
    ask_credentials
-    ask_package_file
-    ask_package_type
-    case $GITEA_PACKAGE_TYPE in
-        debian)
-            upload_debian_package
-        ;;
-        alpine)
-            upload_alpine_package
-        ;;
-        redhat)
-            upload_redhat_package
-        ;;
-        *)
-            echo "Package type '$GITEA_PACKAGE_TYPE' is not yet supported" 1>&2
-            exit 1
-        ;;
-    esac
+    upload_package
 }

 main
--- a/resources/com/cadoles/tamarin/Dockerfile
+++ b/resources/com/cadoles/tamarin/Dockerfile
@ -1,4 +1,4 @@
-FROM reg.cadoles.com/proxy_cache/library/alpine:3.20
+FROM reg.cadoles.com/proxy_cache/library/alpine:3.12

 ARG HTTP_PROXY=
 ARG HTTPS_PROXY=
@ -11,7 +11,7 @@ RUN apk add --no-cache git docker python3 bash openssl curl

 RUN curl -k https://forge.cadoles.com/Cadoles/Jenkins/raw/branch/master/resources/com/cadoles/common/add-letsencrypt-ca.sh | bash

-RUN git clone https://forge.cadoles.com/Cadoles/Tamarin /tamarin\
+RUN git clone http://forge.cadoles.com/Cadoles/Tamarin /tamarin\
  && cd /tamarin\
  && git checkout ${TAMARIN_VERSION}

--- a/resources/com/cadoles/trivy/templates/markdown.tpl
+++ b/resources/com/cadoles/trivy/templates/markdown.tpl
@ -1,56 +0,0 @@
-{{- if . }}
-{{- range . }}
-<h3>Target <code>{{ escapeXML .Target }}</code></h3>
-{{- if (eq (len .Vulnerabilities) 0) }}
-<h4>No Vulnerabilities found</h4>
-{{- else }}
-<h4>Vulnerabilities ({{ len .Vulnerabilities }})</h4>
-<table>
-    <tr>
-        <th>Package</th>
-        <th>ID</th>
-        <th>Severity</th>
-        <th>Installed Version</th>
-        <th>Fixed Version</th>
-    </tr>
-    {{- range .Vulnerabilities }}
-    <tr>
-        <td><code>{{ escapeXML .PkgName }}</code></td>
-        <td>{{ escapeXML .VulnerabilityID }}</td>
-        <td>{{ escapeXML .Severity }}</td>
-        <td>{{ escapeXML .InstalledVersion }}</td>
-        <td>{{ escapeXML .FixedVersion }}</td>
-    </tr>
-    {{- end }}
-</table>
-{{- end }}
-{{- if (eq (len .Misconfigurations ) 0) }}
-<h4>No Misconfigurations found</h4>
-{{- else }}
-<h4>Misconfigurations</h4>
-<table>
-    <tr>
-        <th>Type</th>
-        <th>ID</th>
-        <th>Check</th>
-        <th>Severity</th>
-        <th>Message</th>
-    </tr>
-    {{- range .Misconfigurations }}
-    <tr>
-        <td>{{ escapeXML .Type }}</td>
-        <td>{{ escapeXML .ID }}</td>
-        <td>{{ escapeXML .Title }}</td>
-        <td>{{ escapeXML .Severity }}</td>
-        <td>
-          {{ escapeXML .Message }}
-          <br><a href={{ escapeXML .PrimaryURL | printf "%q" }}>{{ escapeXML .PrimaryURL }}</a></br>
-        </td>
-    </tr>
-    {{- end }}
-</table>
-{{- end }}
-{{- end }}
-{{- else }}
-<h3>Trivy Returned Empty Report</h3>
-{{- end }}
--- a/vars/container.groovy
+++ b/vars/container.groovy
@ -6,7 +6,7 @@
 * - dockerfile - String - Chemin vers le fichier Dockerfile à utiliser pour construire l'image, par défaut "./Dockerfile"
 * - contextDir - String - Répertoire servant de "contexte" pour la construction de l'image, par défault "./"
 * - imageName - String - Nom de l'image à construire, par défaut ""
-* - imageTags - String - Tag(s) apposé(s) sur l'image après construction, par défaut tags générés par la méthode utils.getProjectVersionTags()
+* - imageTag - String - Tag apposé sur l'image après construction, par défaut résultat de la commande `git describe --always`
 * - gitCredentialsId - String - Identifiant des "credentials" Jenkins utilisés pour cloner le dépôt Git, par défaut "forge-jenkins"
 * - dockerRepository - String - Nom d'hôte du registre Docker sur lequel publier l'image, par défaut "reg.cadoles.com"
 * - dockerRepositoryCredentialsId - String - Identifiant des "credentials" Jenkins utilisés pour déployer l'image sur le registre Docker, par défault "reg.cadoles.com-jenkins"
@ -18,14 +18,7 @@ String buildAndPublishImage(Map options = [:]) {
    String contextDir = options.get('contextDir', '.')
    String imageName = options.get('imageName', '')
    String gitRef = sh(returnStdout: true, script: 'git describe --always').trim()
-
-    List<String> defaultImageTags = utils.getProjectVersionTags() + [ "${utils.getProjectVersionDefaultChannel()}-latest" ]
-    List<String> imageTags = options.get('imageTags', defaultImageTags)
-    // Handle legacy imageTag parameter
-    if (options.containsKey('imageTag')) {
-        imageTags = [ options.get("imageTag", gitRef) ]
-    }
-
+    String imageTag = options.get('imageTag', gitRef)
    String gitCredentialsId = options.get('gitCredentialsId', 'forge-jenkins')
    String dockerRepository = options.get('dockerRepository', 'reg.cadoles.com')
    String dockerRepositoryCredentialsId = options.get('dockerRepositoryCredentialsId', 'reg.cadoles.com-jenkins')
@ -51,15 +44,13 @@ String buildAndPublishImage(Map options = [:]) {
            }
        }

-        String primaryImageTag = imageTags[0]
-
-        stage("Build image '${imageName}:${primaryImageTag}'") {
+        stage("Build image '${imageName}:${imageTag}'") {
            git.withHTTPCredentials(gitCredentialsId) {
                sh """
                docker build \
                    --build-arg="GIT_USERNAME=${env.GIT_USERNAME}" \
                    --build-arg="GIT_PASSWORD=${env.GIT_PASSWORD}" \
-                    -t '${imageName}:${primaryImageTag}' \
+                    -t '${imageName}:${imageTag}' \
                    -f '${dockerfile}' \
                    '${contextDir}'
                """
@ -68,33 +59,20 @@ String buildAndPublishImage(Map options = [:]) {

        stage('Validate image with Trivy') {
            utils.when(!skipVerifications) {
-                runTrivyCheck("${imageName}:${primaryImageTag}", projectRepository)
+                runTrivyCheck("${imageName}:${imageTag}", projectRepository)
            }
        }

-       stage("Login with image repository") {
+        stage("Publish image '${imageName}:${imageTag}'") {
            utils.when(!dryRun) {
-                sh """
-                echo ${env.HUB_PASSWORD} | docker login -u '${env.HUB_USERNAME}' --password-stdin '${dockerRepository}'
-                """
-            }
-       }
-
-        imageTags.each { imageTag ->
-            stage("Publish image '${imageName}:${imageTag}'") {
-                utils.when(!dryRun) {
+                retry(2) {
                    sh """
-                    docker tag "${imageName}:${primaryImageTag}" "${imageName}:${imageTag}"
-                    """
-                    retry(2) {
-                        sh """
+                        echo ${env.HUB_PASSWORD} | docker login -u '${env.HUB_USERNAME}' --password-stdin '${dockerRepository}'
                        docker push '${imageName}:${imageTag}'
-                        """
-                    }
+                    """
                }
            }
-        }    
-
+        }
    }
 }

@ -109,12 +87,10 @@ void runHadolintCheck(String dockerfile, String projectRepository) {
        String lintReport = ''

        if (fileExists(reportFile)) {
-            String report = readFile(reportFile)
-
            lintReport = """${lintReport}
            |
            |```
-            |${report.trim() ? report : "Rien à signaler."}
+            |${readFile(reportFile)}
            |```"""
        } else {
            lintReport = """${lintReport}
@ -123,7 +99,7 @@ void runHadolintCheck(String dockerfile, String projectRepository) {
        }

        String defaultReport = '_Rien à signaler !_ :thumbsup:'
-        String report = """## Rapport d'analyse du fichier `${dockerfile}` avec [Hadolint](https://github.com/hadolint/hadolint)
+        String report = """## Validation du Dockerfile `${dockerfile}`
        |
        |${lintReport ?: defaultReport}
        """.stripMargin()
@ -162,8 +138,9 @@ void runTrivyCheck(String imageName, String projectRepository, Map options = [:]
        if (fileExists(reportFile)) {
            lintReport = """${lintReport}
            |
+            |```
            |${readFile(reportFile)}
-            |"""
+            |```"""
        } else {
            lintReport = """${lintReport}
            |
@ -171,7 +148,7 @@ void runTrivyCheck(String imageName, String projectRepository, Map options = [:]
        }

        String defaultReport = '_Rien à signaler !_ :thumbsup:'
-        String report = """## Rapport d'analyse de l'image avec [Trivy](https://github.com/aquasecurity/trivy)
+        String report = """## Validation de l'image `${imageName}`
        |
        |${lintReport ?: defaultReport}
        """.stripMargin()
@ -191,14 +168,11 @@ String validateImageWithTrivy(String imageName, Map options = [:]) {
    String cacheDefaultBranch = options.get('cacheDefaultBranch', 'develop')
    Integer cacheMaxSize = options.get('cacheMaxSize', 250)
    String reportFile = options.get('reportFile', ".trivy-report-${currentBuild.startTimeInMillis}.txt")
-    
-    String markdownTemplate = libraryResource 'com/cadoles/trivy/templates/markdown.tpl'
-    writeFile file:'.trivy-markdown.tpl', text: markdownTemplate
-    
+
    cache(maxCacheSize: cacheMaxSize, defaultBranch: cacheDefaultBranch, caches: [
        [$class: 'ArbitraryFileCache', path: cacheDirectory, compressionMethod: 'TARGZ']
    ]) {
-        sh("'${trivyBin}' --cache-dir '${cacheDirectory}' image --ignorefile .trivyignore.yaml --format template --template '@.trivy-markdown.tpl' -o '${reportFile}' ${trivyArgs} '${imageName}'")
+        sh("'${trivyBin}' --cache-dir '${cacheDirectory}' image -o '${reportFile}' ${trivyArgs} '${imageName}'")
    }

    return reportFile
@ -206,7 +180,7 @@ String validateImageWithTrivy(String imageName, Map options = [:]) {

 String getOrInstallHadolint(Map options = [:]) {
    String installDir = options.get('installDir', '/usr/local/bin')
-    String version = options.get('version', '2.12.0')
+    String version = options.get('version', '2.10.0')
    String forceDownload = options.get('forceDownload', false)
    String downloadUrl = options.get('downloadUrl', "https://github.com/hadolint/hadolint/releases/download/v${version}/hadolint-Linux-x86_64")

@ -226,7 +200,7 @@ String getOrInstallHadolint(Map options = [:]) {

 String getOrInstallTrivy(Map options = [:]) {
    String installDir = options.get('installDir', '/usr/local/bin')
-    String version = options.get('version', '0.47.0')
+    String version = options.get('version', '0.27.1')
    String forceDownload = options.get('forceDownload', false)
    String installScriptDownloadUrl = options.get('downloadUrl', 'https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh')

--- a/vars/debian.groovy
+++ b/vars/debian.groovy
@ -52,7 +52,7 @@ def listRepoPackages(Map params = [:]) {
  def type = params.type ? params.type : 'binary'
  def arch = params.arch ? params.arch : 'amd64'

-  def response = httpRequest(ignoreSslErrors: true, url: "${baseURL}/dists/${distrib}/${component}/${type}-${arch}/Packages")
+  def response = httpRequest(url: "${baseURL}/dists/${distrib}/${component}/${type}-${arch}/Packages")

  def packages = [:]
  def lines = response.content.split('\n')
--- a/vars/standardMakePipeline.groovy
+++ b/vars/standardMakePipeline.groovy
@ -27,19 +27,13 @@ void call(Map options = [:]) {
    String dockerfileExtension = options.get('dockerfileExtension', '')
    List credentials = options.get('credentials', [])

-    List<String> releaseBranches = options.get('releaseBranches', ['develop', 'testing', 'stable', 'staging', 'master'])
+    List<String> releaseBranches = options.get('releaseBranches', ['develop', 'testing', 'stable'])

    node {
        properties([
            buildDiscarder(logRotator(daysToKeepStr: jobHistory, numToKeepStr: jobHistory)),
        ])

-        environment {
-            // Set MKT_PROJECT_VERSION_BRANCH_NAME to Jenkins current branch name by default
-            // See https://forge.cadoles.com/Cadoles/mktools project
-            MKT_PROJECT_VERSION_BRANCH_NAME = env.BRANCH_NAME
-        }
-
        stage('Cancel older jobs') {
            int buildNumber = env.BUILD_NUMBER as int
            if (buildNumber > 1) {
@ -55,7 +49,7 @@ void call(Map options = [:]) {

        try {
            def containerImage = buildContainerImage(baseImage, baseDockerfile, dockerfileExtension)
-            containerImage.inside('-v /var/run/docker.sock:/var/run/docker.sock --network host') {
+            containerImage.inside('-v /var/run/docker.sock:/var/run/docker.sock') {
                String repo = env.JOB_NAME
                if (env.BRANCH_NAME ==~ /^PR-.*$/) {
                    repo = env.JOB_NAME - "/${env.JOB_BASE_NAME}"
@ -84,15 +78,9 @@ void call(Map options = [:]) {
                                    String report = """
                                    |#  Test report for ${gitCommit}
                                    |
-                                    |<details ${output.count('\n') <= 10 ? 'open' : ''}>
-                                    |
-                                    |<summary>Output</summary>
-                                    |
                                    |```
                                    |${output}
                                    |```
-                                    |
-                                    |</details>
                                    |""".trim().stripMargin()

                                    gitea.commentPullRequest(repo, env.CHANGE_ID, report)
@ -117,7 +105,7 @@ void call(Map options = [:]) {
                                        message: """
                                        |:warning: Une erreur est survenue lors de la publication de [${repo}](https://forge.cadoles.com/${repo - env.JOB_BASE_NAME}):
                                        |
-                                        | - **Commit:** [${env.GIT_COMMIT}](https://forge.cadoles.com/${repo - env.JOB_BASE_NAME}/commit/${env.GIT_COMMIT})
+                                        | - **Commit:** [${env.GIT_COMMIT}](https://forge.cadoles.com/${repo - env.JOB_BASE_NAME}commit/${env.GIT_COMMIT})
                                        | - **Tags:** `${env.PROJECT_VERSION_TAG}` / `${env.PROJECT_VERSION_SHORT_TAG}`
                                        |
                                        | **Erreur**
@ -139,7 +127,7 @@ void call(Map options = [:]) {
                                    message: """
                                    |:white_check_mark: Nouvelle publication terminée pour [${repo}](https://forge.cadoles.com/${repo - env.JOB_BASE_NAME}):
                                    |
-                                    | - **Commit:** [${env.GIT_COMMIT}](https://forge.cadoles.com/${repo - env.JOB_BASE_NAME}/commit/${env.GIT_COMMIT})
+                                    | - **Commit:** [${env.GIT_COMMIT}](https://forge.cadoles.com/${repo - env.JOB_BASE_NAME}commit/${env.GIT_COMMIT})
                                    | - **Tags:** `${env.PROJECT_VERSION_TAG}` / `${env.PROJECT_VERSION_SHORT_TAG}`
                                    |
                                    |[Visualiser le job](${env.RUN_DISPLAY_URL})
--- a/vars/utils.groovy
+++ b/vars/utils.groovy
@ -1,5 +1,4 @@
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
-import org.jenkinsci.plugins.pipeline.modeldefinition.when.impl.ChangeSetConditional

 void when(Boolean condition, body) {
    Map config = [:]
@ -45,36 +44,17 @@ String getBuildUser() {
 }

 String getProjectVersionDefaultChannel() {
-    switch (env.BRANCH_NAME) {
-        case 'develop':
-            return 'develop'
-        
-        case 'testing':
-        case 'staging':
-            return 'testing'
-
-        case 'stable':
-        case 'master':
-            return 'stable'
-        
-        default:
-            return env.BRANCH_NAME.toLowerCase().replaceAll('(_|-| )+', '')
-    }
+    return env.BRANCH_NAME.toLowerCase().replaceAll('(_|-| )+', '')
 }

 String getProjectVersionShortChannel(String channel) {
    switch (channel) {
        case 'develop':
            return 'dev'
-        
        case 'testing':
-        case 'staging':
            return 'tst'
-        
        case 'stable':
-        case 'master':
            return 'stb'
-        
        default:
            return channel.toLowerCase().replaceAll('(a|e|i|o|u|y_|-| )+', '').take(3)
    }
@ -84,9 +64,8 @@ List<String> getProjectVersionTags(String overrideChannel = '') {
    String channel = overrideChannel ? overrideChannel : getProjectVersionDefaultChannel()
    String shortChannel = getProjectVersionShortChannel(channel)

-    String currrentCommitDate = sh(script: 'git show -s --format=%ct', returnStdout: true).trim()
-    String dateVersion = sh(script: "TZ=Europe/Paris date -d '@${currrentCommitDate}' +%Y.%-m.%-d", returnStdout: true).trim()
-    String timestamp = sh(script: "TZ=Europe/Paris date -d '@${currrentCommitDate}' +%-H%M", returnStdout: true).trim()
+    String dateVersion = sh(script: 'date +%Y.%-m.%-d', returnStdout: true).trim()
+    String timestamp = sh(script: 'date +%-H%M', returnStdout: true).trim()
    String shortCommit = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()

    String longTag = "${dateVersion}-${channel}.${timestamp}.${shortCommit}"
@ -98,20 +77,3 @@ List<String> getProjectVersionTags(String overrideChannel = '') {
 Boolean isPR() {
    return env.BRANCH_NAME ==~ /^PR-.*$/
 }
-
-
-def hasChanges(String pattern) {
-    def changeLogSets = currentBuild.changeSets
-    def conditional = new ChangeSetConditional(pattern)
-
-    for (set in changeLogSets) {
-        def entries = set.items
-        for (entry in entries) {
-            if (conditional.changeSetMatches(entry, pattern, true)) {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}