Change all PR ci jobs (-ci-pr_any-) to use the yaml configuration (#1022

) * Just report true on exsiting linux -ci-pr_any * Geneate -ci-pr_any- for all jobs using yaml Signed-off-by: Jose Luis Rivero <[email protected]> --------- Signed-off-by: Jose Luis Rivero <[email protected]>
gazebo-tooling · Oct 6, 2023 · 81651dd · 81651dd
1 parent 7e831e6
commit 81651dd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 43 deletions.
diff --git a/jenkins-scripts/dsl/gazebo_libs.dsl b/jenkins-scripts/dsl/gazebo_libs.dsl
@@ -75,10 +75,6 @@ boolean is_testing_enabled(lib_name, ci_config)
 void generate_ciconfigs_by_lib(config, configs_per_lib_index)
 {
   config.collections.each { collection ->
-    // TODO(jrivero): limit to harmonic for testing proposes
-    if (collection.name != 'harmonic')
-      return
-
     collection.libs.each { lib ->
       def libName = lib.name
       def branch = lib.repo.current_branch
@@ -181,6 +177,10 @@ configs_per_lib_index.each { lib_name, lib_configs ->
 
     // CI branch jobs (-ci-$branch-) (pulling check every 5 minutes)
     branches_with_collections.each { branch_and_collection ->
+      // 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)

diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl
@@ -443,31 +443,13 @@ gz_software.each { gz_sw ->
     def gz_ci_job_name = "ignition_${software_name}-ci-pr_any-ubuntu_auto-${arch}"
     def gz_ci_any_job = job(gz_ci_job_name)
     def gz_checkout_dir = "ign-${software_name}"
-    OSRFLinuxCompilationAnyGitHub.create(gz_ci_any_job,
-                                        "gazebosim/${gz_checkout_dir}",
-                                         enable_testing(software_name))
-    include_gpu_label_if_needed(gz_ci_any_job, software_name)
+    GenericAnyJobGitHub.create(gz_ci_any_job,
+                              "gazebosim/${gz_checkout_dir}",
+                               [],
+                               true)
     gz_ci_any_job.with
     {
-      if (gz_sw == 'physics') {
-        label Globals.nontest_label("large-memory")
-        extra_str += '\nexport MAKE_JOBS=1'
-      }
-
-      steps
-      {
-         shell("""\
-              #!/bin/bash -xe
-
-              export DISTRO=${ci_distro_str}
-
-              ${GLOBAL_SHELL_CMD}
-
-              export ARCH=${arch}
-
-              /bin/bash -xe ./scripts/jenkins-scripts/docker/gz_${gz_sw.replaceAll('-','_')}-compilation.bash
-              """.stripIndent())
-      } // end of steps
+      description 'Automatic generated job by DSL jenkins. Stub job for migration, not doing any check'
     } // end of ci_any_job
 
     // add ci-pr_any to the list for CIWorkflow

diff --git a/jenkins-scripts/dsl/sdformat.dsl b/jenkins-scripts/dsl/sdformat.dsl
@@ -87,24 +87,12 @@ ci_distro.each { distro ->
     }
 
     // --------------------------------------------------------------
-    // 2. Create the any job
+    // 2. Create a fake any job for migrating
+    // TODO: remove the job once the migration in https://github.com/gazebo-tooling/release-tools/issues/1010
+    // is done.
     String sdf_repo = "gazebosim/sdformat"
     def sdformat_ci_any_job = job(ci_build_any_job_name_linux)
-    OSRFLinuxCompilationAnyGitHub.create(sdformat_ci_any_job, sdf_repo)
-    sdformat_ci_any_job.with
-    {
-      steps
-      {
-         shell("""\
-         #!/bin/bash -xe
-
-         export DISTRO=${ci_distro_str}
-
-         export ARCH=${arch}
-         /bin/bash -xe ./scripts/jenkins-scripts/docker/sdformat-compilation.bash
-         """.stripIndent())
-       }
-     }
+    GenericAnyJobGitHub.create(sdformat_ci_any_job, sdf_repo)
   } // end of arch
 } // end of distro