From 200fcfd96aceaf2d0791682a6b16e80a59669e52 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Tue, 25 Jun 2024 10:12:44 -0500
Subject: [PATCH 1/2] Add a global CI job for infrastructure packages

---
 global/ci-infra.repos | 195 ++++++++++++++++++++++++++++++++++++++++++
 global/ci-infra.yaml  |  92 ++++++++++++++++++++
 index.yaml            |   2 +
 3 files changed, 289 insertions(+)
 create mode 100644 global/ci-infra.repos
 create mode 100644 global/ci-infra.yaml

diff --git a/global/ci-infra.repos b/global/ci-infra.repos
new file mode 100644
index 00000000..41e59403
--- /dev/null
+++ b/global/ci-infra.repos
@@ -0,0 +1,195 @@
+%YAML 1.1
+---
+repositories:
+  bloom:
+    type: git
+    url: https://github.com/ros-infrastructure/bloom.git
+    version: master
+  catkin-sphinx:
+    type: git
+    url: https://github.com/ros-infrastructure/catkin-sphinx.git
+    version: master
+  catkin_pkg:
+    type: git
+    url: https://github.com/ros-infrastructure/catkin_pkg.git
+    version: master
+  src/colcon-alias:
+    type: git
+    url: https://github.com/colcon/colcon-alias.git
+    version: main
+  src/colcon-argcomplete:
+    type: git
+    url: https://github.com/colcon/colcon-argcomplete.git
+    version: master
+  src/colcon-bash:
+    type: git
+    url: https://github.com/colcon/colcon-bash.git
+    version: master
+  src/colcon-cargo:
+    type: git
+    url: https://github.com/colcon/colcon-cargo.git
+    version: main
+  src/colcon-cd:
+    type: git
+    url: https://github.com/colcon/colcon-cd.git
+    version: master
+  src/colcon-clean:
+    type: git
+    url: https://github.com/colcon/colcon-clean.git
+    version: master
+  src/colcon-cmake:
+    type: git
+    url: https://github.com/colcon/colcon-cmake.git
+    version: master
+  src/colcon-common-extensions:
+    type: git
+    url: https://github.com/colcon/colcon-common-extensions.git
+    version: master
+  src/colcon-core:
+    type: git
+    url: https://github.com/colcon/colcon-core.git
+    version: master
+  src/colcon-coveragepy-result:
+    type: git
+    url: https://github.com/colcon/colcon-coveragepy-result.git
+    version: master
+  src/colcon-defaults:
+    type: git
+    url: https://github.com/colcon/colcon-defaults.git
+    version: master
+  src/colcon-devtools:
+    type: git
+    url: https://github.com/colcon/colcon-devtools.git
+    version: master
+  src/colcon-ed:
+    type: git
+    url: https://github.com/colcon/colcon-ed.git
+    version: master
+  src/colcon-hardware-acceleration:
+    type: git
+    url: https://github.com/colcon/colcon-hardware-acceleration.git
+    version: main
+  src/colcon-installed-package-information:
+    type: git
+    url: https://github.com/colcon/colcon-installed-package-information.git
+    version: main
+  src/colcon-lcov-result:
+    type: git
+    url: https://github.com/colcon/colcon-lcov-result.git
+    version: master
+  src/colcon-library-path:
+    type: git
+    url: https://github.com/colcon/colcon-library-path.git
+    version: master
+  src/colcon-meson:
+    type: git
+    url: https://github.com/colcon/colcon-meson.git
+    version: main
+  src/colcon-metadata:
+    type: git
+    url: https://github.com/colcon/colcon-metadata.git
+    version: master
+  src/colcon-mixin:
+    type: git
+    url: https://github.com/colcon/colcon-mixin.git
+    version: master
+  src/colcon-notification:
+    type: git
+    url: https://github.com/colcon/colcon-notification.git
+    version: master
+  src/colcon-output:
+    type: git
+    url: https://github.com/colcon/colcon-output.git
+    version: master
+  src/colcon-override-check:
+    type: git
+    url: https://github.com/colcon/colcon-override-check.git
+    version: main
+  src/colcon-package-information:
+    type: git
+    url: https://github.com/colcon/colcon-package-information.git
+    version: master
+  src/colcon-package-selection:
+    type: git
+    url: https://github.com/colcon/colcon-package-selection.git
+    version: master
+  src/colcon-parallel-executor:
+    type: git
+    url: https://github.com/colcon/colcon-parallel-executor.git
+    version: master
+  src/colcon-pkg-config:
+    type: git
+    url: https://github.com/colcon/colcon-pkg-config.git
+    version: master
+  src/colcon-powershell:
+    type: git
+    url: https://github.com/colcon/colcon-powershell.git
+    version: master
+  src/colcon-python-setup-py:
+    type: git
+    url: https://github.com/colcon/colcon-python-setup-py.git
+    version: master
+  src/colcon-recursive-crawl:
+    type: git
+    url: https://github.com/colcon/colcon-recursive-crawl.git
+    version: master
+  src/colcon-rerun:
+    type: git
+    url: https://github.com/colcon/colcon-rerun.git
+    version: main
+  src/colcon-ros:
+    type: git
+    url: https://github.com/colcon/colcon-ros.git
+    version: master
+  src/colcon-ros-bazel:
+    type: git
+    url: https://github.com/colcon/colcon-ros-bazel.git
+    version: master
+  src/colcon-ros-cargo:
+    type: git
+    url: https://github.com/colcon/colcon-ros-cargo.git
+    version: main
+  src/colcon-ros-domain-id-coordinator:
+    type: git
+    url: https://github.com/colcon/colcon-ros-domain-id-coordinator.git
+    version: main
+  src/colcon-spawn-shell:
+    type: git
+    url: https://github.com/colcon/colcon-spawn-shell.git
+    version: develop
+  src/colcon-test-result:
+    type: git
+    url: https://github.com/colcon/colcon-test-result.git
+    version: master
+  src/colcon-zsh:
+    type: git
+    url: https://github.com/colcon/colcon-zsh.git
+    version: master
+  src/template-package:
+    type: git
+    url: https://github.com/colcon/template-package.git
+    version: main
+  rosdep:
+    type: git
+    url: https://github.com/ros-infrastructure/rosdep.git
+    version: master
+  rosdistro:
+    type: git
+    url: https://github.com/ros-infrastructure/rosdistro.git
+    version: master
+  rosdoc2:
+    type: git
+    url: https://github.com/ros-infrastructure/rosdoc2.git
+    version: main
+  rosinstall_generator:
+    type: git
+    url: https://github.com/ros-infrastructure/rosinstall_generator.git
+    version: master
+  rospkg:
+    type: git
+    url: https://github.com/ros-infrastructure/rospkg.git
+    version: master
+  superflore:
+    type: git
+    url: https://github.com/ros-infrastructure/superflore.git
+    version: master
diff --git a/global/ci-infra.yaml b/global/ci-infra.yaml
new file mode 100644
index 00000000..1687b099
--- /dev/null
+++ b/global/ci-infra.yaml
@@ -0,0 +1,92 @@
+%YAML 1.1
+# ROS buildfarm ci-build file
+---
+build_environment_variables:
+  PYTHONWARNINGS: 'ignore:pkg_resources::'
+build_tool: colcon
+build_tool_test_args: '--event-handler console_stderr- console_cohesion+ --executor parallel --python-testing pytest --pytest-args -k "not test_spell_check" --packages-skip superflore'
+install_packages:
+- doxygen
+- gem
+- graphviz
+- meson
+- python-is-python3
+- python3-docker
+- python3-exhale
+- python3-filelock
+- python3-flake8
+- python3-flake8-builtins
+- python3-flake8-class-newline
+- python3-flake8-comprehensions
+- python3-flake8-deprecated
+- python3-flake8-docstrings
+- python3-flake8-import-order
+- python3-flake8-quotes
+- python3-git
+- python3-github
+- python3-jinja2
+- python3-myst-parser
+- python3-pep8
+- python3-pip
+- python3-scantree
+- python3-sphinx
+- python3-sphinx-rtd-theme
+- python3-termcolor
+- python3-vcstools
+- python3-xmltodict
+- ruby
+jenkins_job_label: ci-agent
+jenkins_job_priority: 50
+jenkins_job_schedule: 10 23 * * *
+jenkins_job_timeout: 30
+jenkins_job_weight: 4
+repos_files:
+- !relative_url ci-infra.repos
+repositories:
+  keys:
+  - |
+    -----BEGIN PGP PUBLIC KEY BLOCK-----
+
+    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
+    =7qfN
+    -----END PGP PUBLIC KEY BLOCK-----
+  urls:
+  - http://repos.ros.org/repos/ros_bootstrap
+targets:
+  ubuntu:
+    noble:
+      amd64:
+type: ci-build
+version: 1
diff --git a/index.yaml b/index.yaml
index 88d5a9aa..f5d19a66 100644
--- a/index.yaml
+++ b/index.yaml
@@ -1,6 +1,8 @@
 %YAML 1.1
 # ROS buildfarm index file
 ---
+ci_builds:
+  infra: global/ci-infra.yaml
 distributions:
   humble:
     ci_builds:

From 5ffb3bd2cb7d2336f2967929b790530e66215051 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Tue, 3 Dec 2024 17:02:06 -0600
Subject: [PATCH 2/2] Move repos file to ros-infrastructure/ci

---
 global/ci-infra.repos | 195 ------------------------------------------
 global/ci-infra.yaml  |   2 +-
 2 files changed, 1 insertion(+), 196 deletions(-)
 delete mode 100644 global/ci-infra.repos

diff --git a/global/ci-infra.repos b/global/ci-infra.repos
deleted file mode 100644
index 41e59403..00000000
--- a/global/ci-infra.repos
+++ /dev/null
@@ -1,195 +0,0 @@
-%YAML 1.1
----
-repositories:
-  bloom:
-    type: git
-    url: https://github.com/ros-infrastructure/bloom.git
-    version: master
-  catkin-sphinx:
-    type: git
-    url: https://github.com/ros-infrastructure/catkin-sphinx.git
-    version: master
-  catkin_pkg:
-    type: git
-    url: https://github.com/ros-infrastructure/catkin_pkg.git
-    version: master
-  src/colcon-alias:
-    type: git
-    url: https://github.com/colcon/colcon-alias.git
-    version: main
-  src/colcon-argcomplete:
-    type: git
-    url: https://github.com/colcon/colcon-argcomplete.git
-    version: master
-  src/colcon-bash:
-    type: git
-    url: https://github.com/colcon/colcon-bash.git
-    version: master
-  src/colcon-cargo:
-    type: git
-    url: https://github.com/colcon/colcon-cargo.git
-    version: main
-  src/colcon-cd:
-    type: git
-    url: https://github.com/colcon/colcon-cd.git
-    version: master
-  src/colcon-clean:
-    type: git
-    url: https://github.com/colcon/colcon-clean.git
-    version: master
-  src/colcon-cmake:
-    type: git
-    url: https://github.com/colcon/colcon-cmake.git
-    version: master
-  src/colcon-common-extensions:
-    type: git
-    url: https://github.com/colcon/colcon-common-extensions.git
-    version: master
-  src/colcon-core:
-    type: git
-    url: https://github.com/colcon/colcon-core.git
-    version: master
-  src/colcon-coveragepy-result:
-    type: git
-    url: https://github.com/colcon/colcon-coveragepy-result.git
-    version: master
-  src/colcon-defaults:
-    type: git
-    url: https://github.com/colcon/colcon-defaults.git
-    version: master
-  src/colcon-devtools:
-    type: git
-    url: https://github.com/colcon/colcon-devtools.git
-    version: master
-  src/colcon-ed:
-    type: git
-    url: https://github.com/colcon/colcon-ed.git
-    version: master
-  src/colcon-hardware-acceleration:
-    type: git
-    url: https://github.com/colcon/colcon-hardware-acceleration.git
-    version: main
-  src/colcon-installed-package-information:
-    type: git
-    url: https://github.com/colcon/colcon-installed-package-information.git
-    version: main
-  src/colcon-lcov-result:
-    type: git
-    url: https://github.com/colcon/colcon-lcov-result.git
-    version: master
-  src/colcon-library-path:
-    type: git
-    url: https://github.com/colcon/colcon-library-path.git
-    version: master
-  src/colcon-meson:
-    type: git
-    url: https://github.com/colcon/colcon-meson.git
-    version: main
-  src/colcon-metadata:
-    type: git
-    url: https://github.com/colcon/colcon-metadata.git
-    version: master
-  src/colcon-mixin:
-    type: git
-    url: https://github.com/colcon/colcon-mixin.git
-    version: master
-  src/colcon-notification:
-    type: git
-    url: https://github.com/colcon/colcon-notification.git
-    version: master
-  src/colcon-output:
-    type: git
-    url: https://github.com/colcon/colcon-output.git
-    version: master
-  src/colcon-override-check:
-    type: git
-    url: https://github.com/colcon/colcon-override-check.git
-    version: main
-  src/colcon-package-information:
-    type: git
-    url: https://github.com/colcon/colcon-package-information.git
-    version: master
-  src/colcon-package-selection:
-    type: git
-    url: https://github.com/colcon/colcon-package-selection.git
-    version: master
-  src/colcon-parallel-executor:
-    type: git
-    url: https://github.com/colcon/colcon-parallel-executor.git
-    version: master
-  src/colcon-pkg-config:
-    type: git
-    url: https://github.com/colcon/colcon-pkg-config.git
-    version: master
-  src/colcon-powershell:
-    type: git
-    url: https://github.com/colcon/colcon-powershell.git
-    version: master
-  src/colcon-python-setup-py:
-    type: git
-    url: https://github.com/colcon/colcon-python-setup-py.git
-    version: master
-  src/colcon-recursive-crawl:
-    type: git
-    url: https://github.com/colcon/colcon-recursive-crawl.git
-    version: master
-  src/colcon-rerun:
-    type: git
-    url: https://github.com/colcon/colcon-rerun.git
-    version: main
-  src/colcon-ros:
-    type: git
-    url: https://github.com/colcon/colcon-ros.git
-    version: master
-  src/colcon-ros-bazel:
-    type: git
-    url: https://github.com/colcon/colcon-ros-bazel.git
-    version: master
-  src/colcon-ros-cargo:
-    type: git
-    url: https://github.com/colcon/colcon-ros-cargo.git
-    version: main
-  src/colcon-ros-domain-id-coordinator:
-    type: git
-    url: https://github.com/colcon/colcon-ros-domain-id-coordinator.git
-    version: main
-  src/colcon-spawn-shell:
-    type: git
-    url: https://github.com/colcon/colcon-spawn-shell.git
-    version: develop
-  src/colcon-test-result:
-    type: git
-    url: https://github.com/colcon/colcon-test-result.git
-    version: master
-  src/colcon-zsh:
-    type: git
-    url: https://github.com/colcon/colcon-zsh.git
-    version: master
-  src/template-package:
-    type: git
-    url: https://github.com/colcon/template-package.git
-    version: main
-  rosdep:
-    type: git
-    url: https://github.com/ros-infrastructure/rosdep.git
-    version: master
-  rosdistro:
-    type: git
-    url: https://github.com/ros-infrastructure/rosdistro.git
-    version: master
-  rosdoc2:
-    type: git
-    url: https://github.com/ros-infrastructure/rosdoc2.git
-    version: main
-  rosinstall_generator:
-    type: git
-    url: https://github.com/ros-infrastructure/rosinstall_generator.git
-    version: master
-  rospkg:
-    type: git
-    url: https://github.com/ros-infrastructure/rospkg.git
-    version: master
-  superflore:
-    type: git
-    url: https://github.com/ros-infrastructure/superflore.git
-    version: master
diff --git a/global/ci-infra.yaml b/global/ci-infra.yaml
index 1687b099..24833ebd 100644
--- a/global/ci-infra.yaml
+++ b/global/ci-infra.yaml
@@ -41,7 +41,7 @@ jenkins_job_schedule: 10 23 * * *
 jenkins_job_timeout: 30
 jenkins_job_weight: 4
 repos_files:
-- !relative_url ci-infra.repos
+- https://raw.githubusercontent.com/ros-infrastructure/ci/refs/heads/main/ros-infrastructure.repos
 repositories:
   keys:
   - |