From 4dfdb53bad55d8e42fa944ebb78dbf90c077501f Mon Sep 17 00:00:00 2001
From: Benjamin Bohard <bbohard@cadoles.com>
Date: Wed, 9 Feb 2022 21:47:04 +0100
Subject: [PATCH] Distribution inconditionnelle

---
 Jenkinsfile      | 18 +++++++++++-------
 vars/pulp.groovy | 10 +++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2328859..f523c6f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -103,8 +103,12 @@ pipeline {
                             )
                             
                             // On publie chacun des paquets construits
+                            def repositoriesMapping = ['unstable': 'Cadoles4MSE unstable',
+                                           'dev': 'Cadoles4MSE dev',
+                                           'staging': 'Cadoles4MSE staging',
+                                           'stable': 'Cadoles4MSE stable']
                             def credentials = '212d6dc7-f9a2-4d27-94d8-de7fc6cae0a1'
-                            def repositoryHREF = pulp.getRepositoryHREF(credentials, result.env)
+                            def repositoryHREF = pulp.getRepositoryHREF(credentials, repositoriesMapping[result.env])
                             def exportTasks = pulp.exportPackages(credentials, result.packages)
                             def pulpPackages = []
                             exportTasks.each {
@@ -114,16 +118,16 @@ pipeline {
                             }
                             }
                             pulp.addToRepository(credentials, pulpPackages, repositoryHREF)
-                            if (result.env == 'dev') {
-                                def publicationHREF = pulp.publishRepository(credentials, repositoryHREF)
-                                def distributionHREF = pulp.distributePublication(credentials, publicationHREF[0], 'Cadoles4MSE_dev', 'Cadoles4MSE_dev')
-                                println(pulp.getDistributionURL(credentials, distributionHREF[0]))
-                            }
+                            def publicationHREF = pulp.publishRepository(credentials, repositoryHREF)
+                            def distributionName = repositoriesMapping[result.env]
+                            def base_path = distributionName.replaceAll(' ', '_')
+                            def distributionHREF = pulp.distributePublication(credentials, publicationHREF[0], distributionName, base_path)
+                            def distributionURL = pulp.getDistributionURL(credentials, distributionHREF[0]))
 
                             // On liste l'ensemble des paquets construits
                             def publishedPackages = result.packages.collect { p ->
                                     def file = new File(p)
-                                    return "- Paquet `${file.getName()}`, Dépôt `${result.env}`, Distribution `${result.distrib}`"
+                                    return "- Paquet `${file.getName()}`, Dépôt `${result.env}`, Distribution `${result.distrib}`, URL `${distributionURL}`"
                             }
                             
                             // On notifie le canal Rocket.Chat de la publication des paquets
diff --git a/vars/pulp.groovy b/vars/pulp.groovy
index cb01c39..babceb9 100644
--- a/vars/pulp.groovy
+++ b/vars/pulp.groovy
@@ -28,21 +28,17 @@ def createRepository(
 }
 def getRepositoryHREF(
     String credentials,
-    String repositoryLevel = 'dev',
+    String repository = 'Cadoles4MSE unstable',
     String pulpHost = '192.168.30.3'
     ) {
-    def repositoriesMapping = ['unstable': 'Cadoles4MSE unstable',
-                               'dev': 'Cadoles4MSE dev',
-                               'staging': 'Cadoles4MSE staging',
-                               'stable': 'Cadoles4MSE stable']
     def response = httpRequest authentication: credentials, url: "https://${pulpHost}/pulp/api/v3/repositories/deb/apt/", httpMode: 'GET', ignoreSslErrors: true
     def jsonResponse = readJSON text: response.content
     def repositories = jsonResponse.results
-    def repositoryHREF = repositories.find { it -> it['name'] == repositoriesMapping[repositoryLevel] }
+    def repositoryHREF = repositories.find { it -> it['name'] == repository }
     if (repositoryHREF) {
         return repositoryHREF.pulp_href
     } else {
-        return createRepository(credentials, repositoriesMapping[repositoryLevel])
+        return createRepository(credentials, repository])
     }
 }