From 8100c596b59cc86be3a620b4979cdcf5fe61f009 Mon Sep 17 00:00:00 2001 From: Patrick Creech Date: Fri, 16 Aug 2024 11:11:18 -0400 Subject: [PATCH] Foreman 3.12 branching --- centos.org/jobs/foreman-pipelines.yml | 1 + centos.org/jobs/katello-pipelines.yml | 1 + .../pipelines/vars/foreman/3.12.groovy | 44 +++++++++++++++++++ .../pipelines/vars/katello/4.14.groovy | 18 ++++++++ .../yaml/includes/foreman_versions.yaml.inc | 1 + .../includes/foreman_versions_copr.yaml.inc | 1 + .../jobs/pipeline/katello-rpm-pipeline.yaml | 1 + 7 files changed, 67 insertions(+) create mode 100644 theforeman.org/pipelines/vars/foreman/3.12.groovy create mode 100644 theforeman.org/pipelines/vars/katello/4.14.groovy diff --git a/centos.org/jobs/foreman-pipelines.yml b/centos.org/jobs/foreman-pipelines.yml index ada0b516..fc84b71b 100644 --- a/centos.org/jobs/foreman-pipelines.yml +++ b/centos.org/jobs/foreman-pipelines.yml @@ -10,6 +10,7 @@ version: - '3.10' - '3.11' + - '3.12' - nightly type: - foreman diff --git a/centos.org/jobs/katello-pipelines.yml b/centos.org/jobs/katello-pipelines.yml index 1b5ce01d..62d1258b 100644 --- a/centos.org/jobs/katello-pipelines.yml +++ b/centos.org/jobs/katello-pipelines.yml @@ -7,6 +7,7 @@ version: - '4.12' - '4.13' + - '4.14' - 'nightly' type: - katello diff --git a/theforeman.org/pipelines/vars/foreman/3.12.groovy b/theforeman.org/pipelines/vars/foreman/3.12.groovy new file mode 100644 index 00000000..983a9e28 --- /dev/null +++ b/theforeman.org/pipelines/vars/foreman/3.12.groovy @@ -0,0 +1,44 @@ +def foreman_version = '3.12' +def git_branch = "${foreman_version}-stable" + +def foreman_client_distros = [ + 'el9', + 'el8', + 'el7' +] +def foreman_el_releases = [ + 'el9', + 'el8' +] +def foreman_debian_releases = ['bullseye', 'bookworm', 'focal', 'jammy'] + +def pipelines_deb = [ + 'install': [ + 'debian11', + 'ubuntu2004', + 'ubuntu2204' + ], + 'upgrade': [ + 'debian11', + 'ubuntu2004', + 'ubuntu2204' + ] +] + +def pipelines_el = [ + 'install': [ + 'centos9-stream', + 'almalinux8', + 'almalinux9', + ], + 'upgrade': [ + 'centos9-stream', + 'almalinux8', + 'almalinux9', + ] +] + +def pipelines = [ + 'install': pipelines_deb['install'] + pipelines_el['install'], + 'upgrade': pipelines_deb['upgrade'] + pipelines_el['upgrade'], +] diff --git a/theforeman.org/pipelines/vars/katello/4.14.groovy b/theforeman.org/pipelines/vars/katello/4.14.groovy new file mode 100644 index 00000000..07b77c84 --- /dev/null +++ b/theforeman.org/pipelines/vars/katello/4.14.groovy @@ -0,0 +1,18 @@ +def foreman_version = '3.12' +def katello_version = '4.14' +def foreman_el_releases = [ + 'el8', + 'el9' +] +def pipelines = [ + 'install': [ + 'centos9-stream', + 'almalinux8', + 'almalinux9', + ], + 'upgrade': [ + 'centos9-stream', + 'almalinux8', + 'almalinux9', + ] +] diff --git a/theforeman.org/yaml/includes/foreman_versions.yaml.inc b/theforeman.org/yaml/includes/foreman_versions.yaml.inc index bb91c090..f8b35ed1 100644 --- a/theforeman.org/yaml/includes/foreman_versions.yaml.inc +++ b/theforeman.org/yaml/includes/foreman_versions.yaml.inc @@ -1,2 +1,3 @@ - '3.10' - '3.11' +- '3.12' diff --git a/theforeman.org/yaml/includes/foreman_versions_copr.yaml.inc b/theforeman.org/yaml/includes/foreman_versions_copr.yaml.inc index bb91c090..f8b35ed1 100644 --- a/theforeman.org/yaml/includes/foreman_versions_copr.yaml.inc +++ b/theforeman.org/yaml/includes/foreman_versions_copr.yaml.inc @@ -1,2 +1,3 @@ - '3.10' - '3.11' +- '3.12' diff --git a/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml b/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml index 4f253445..39d3b017 100644 --- a/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml +++ b/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml @@ -20,3 +20,4 @@ version: - '4.12' - '4.13' + - '4.14'