Move ignore_major to colections

Signed-off-by: Jose Luis Rivero <[email protected]>
gazebo-tooling · Oct 12, 2023 · c77fdec · c77fdec
1 parent 4f179a6
commit c77fdec
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/jenkins-scripts/dsl/gazebo_libs.dsl b/jenkins-scripts/dsl/gazebo_libs.dsl
@@ -88,6 +88,8 @@ void generate_ciconfigs_by_lib(config, ciconf_per_lib_index, pkgconf_per_src_ind
         ciconf_per_lib_index[libName][config_name].contains(branch) ?: ciconf_per_lib_index[libName][config_name] << [branch: branch, collection: collection.name]
       }
       def pkg_name = lib.name + lib.major_version
+      if (collection.packaging.linux?.ignore_major_version?.contains(libName))
+        pkg_name = lib.name
       collection.packaging.configs?.each { config_name ->
         pkgconf_per_src_index[pkg_name][config_name] = pkgconf_per_src_index[pkg_name][config_name]?: []
         pkgconf_per_src_index[pkg_name][config_name] << [ lib_name: libName, collection: collection.name ]
@@ -192,7 +194,6 @@ ciconf_per_lib_index.each { lib_name, lib_configs ->
       // TODO: remove after testing
       if (branch_and_collection.collection != 'harmonic')
         return
-
       branch_name = branch_and_collection.branch
       def gz_ci_job = job("${gz_job_name_prefix}-ci-${branch_name}-${distro}-${arch}")
       generate_ci_job(gz_ci_job, lib_name, branch_name, ci_config)
@@ -231,12 +232,7 @@ pkgconf_per_src_index.each { pkg_src, pkg_src_configs ->
     //if (canonical_lib_name != 'gz-cmake')
     // return
 
-    if (pkg_config.ignore_major_version?.contains(canonical_lib_name))
-      job_name = "${canonical_lib_name}-source"
-    else
-      job_name = "${pkg_src}-source"
-
-    def gz_source_job = job(job_name)
+    def gz_source_job = job("${pkg_src}-source")
     OSRFSourceCreation.create(gz_source_job, [
       PACKAGE: pkg_src ,
       SOURCE_REPO_URI: "https://github.com/gazebosim/${canonical_lib_name}.git"])

diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml
@@ -98,6 +98,9 @@ collections:
     packaging:
       configs:
         - bionic
+      linux:
+          ignore_major_version:
+            - ign-citadel
   - name: 'fortress'
     libs:
       - name: gz-cmake
@@ -174,6 +177,9 @@ collections:
     packaging:
       configs:
         - focal
+      linux:
+        ignore_major_version:
+          - gz-fortress
   - name: 'garden'
     libs:
       - name: gz-cmake
@@ -250,6 +256,9 @@ collections:
     packaging:
       configs:
         - focal
+      linux:
+        ignore_major_version:
+          - gz-garden
   - name: 'harmonic'
     libs:
       - name: gz-cmake
@@ -326,6 +335,9 @@ collections:
     packaging:
       configs:
         - jammy
+      linux:
+        ignore_major_version:
+          - gz-harmonic
       nightly:
         distros:
           - jammy
@@ -476,8 +488,6 @@ packaging_configs:
         - i386
         - amd64
         - arm64
-    ignore_major_version:
-      - ign-citadel
   - name: focal
     system:
       so: linux
@@ -486,9 +496,6 @@ packaging_configs:
       arch:
         - amd64
         - arm64
-    ignore_major_version:
-      - gz-fortress
-      - gz-garden
   - name: jammy
     system:
       so: linux
@@ -498,6 +505,3 @@ packaging_configs:
         - amd64
         - arm64
         - armhf
-    ignore_major_version:
-      - gz-harmonic
-      - __upcoming__
diff --git a/jenkins-scripts/dsl/ignition_collection.dsl b/jenkins-scripts/dsl/ignition_collection.dsl
@@ -17,7 +17,7 @@ String get_debbuilder_name(parsed_yaml_lib, parsed_yaml_packaging)
 {
   major_version = parsed_yaml_lib.major_version
 
-  ignore_major_version = parsed_yaml_packaging.linux?.package_name?.ignore_major_version
+  ignore_major_version = parsed_yaml_packaging.linux?.ignore_major_version
   if (ignore_major_version && ignore_major_version.contains(parsed_yaml_lib.name))
     major_version = ""