From 24916499abf6b29e9e06e9b675a1d18d92d20528 Mon Sep 17 00:00:00 2001 From: Patrick Creech Date: Tue, 20 Feb 2024 10:45:13 -0500 Subject: [PATCH] Foreman 3.10 Jobs/Pipelines --- centos.org/jobs/foreman-pipelines.yml | 1 + centos.org/jobs/katello-pipelines.yml | 1 + .../pipelines/test/foreman/vars.groovy | 8 ++++ .../pipelines/test/testKatello.groovy | 4 ++ .../pipelines/vars/foreman/3.10.groovy | 43 +++++++++++++++++++ .../pipelines/vars/katello/4.12.groovy | 19 ++++++++ .../yaml/includes/foreman_versions.yaml.inc | 1 + .../includes/foreman_versions_copr.yaml.inc | 1 + .../jobs/pipeline/katello-rpm-pipeline.yaml | 1 + .../yaml/jobs/test_3_10_stable.yaml | 33 ++++++++++++++ theforeman.org/yaml/views/release.yml | 1 + 11 files changed, 113 insertions(+) create mode 100644 theforeman.org/pipelines/vars/foreman/3.10.groovy create mode 100644 theforeman.org/pipelines/vars/katello/4.12.groovy create mode 100644 theforeman.org/yaml/jobs/test_3_10_stable.yaml diff --git a/centos.org/jobs/foreman-pipelines.yml b/centos.org/jobs/foreman-pipelines.yml index 56fd88af..b7b9c07a 100644 --- a/centos.org/jobs/foreman-pipelines.yml +++ b/centos.org/jobs/foreman-pipelines.yml @@ -11,6 +11,7 @@ - '3.7' - '3.8' - '3.9' + - '3.10' - nightly type: - foreman diff --git a/centos.org/jobs/katello-pipelines.yml b/centos.org/jobs/katello-pipelines.yml index b35f80cb..2ecc02df 100644 --- a/centos.org/jobs/katello-pipelines.yml +++ b/centos.org/jobs/katello-pipelines.yml @@ -8,6 +8,7 @@ - '4.9' - '4.10' - '4.11' + - '4.12' - 'nightly' type: - katello diff --git a/theforeman.org/pipelines/test/foreman/vars.groovy b/theforeman.org/pipelines/test/foreman/vars.groovy index 88d0a6c2..06cdb426 100644 --- a/theforeman.org/pipelines/test/foreman/vars.groovy +++ b/theforeman.org/pipelines/test/foreman/vars.groovy @@ -3,6 +3,10 @@ def foreman_integration_versions = [ 'ruby': ['2.7'], 'katello': 'master' ], + '3.10-stable': [ + 'ruby': ['2.7'], + 'katello': 'KATELLO-4.12' + ], '3.9-stable': [ 'ruby': ['2.7'], 'katello': 'KATELLO-4.11' @@ -33,6 +37,10 @@ def foreman_unit_versions = [ 'develop': [ 'ruby': ['2.7'] ], + '3.10-stable': [ + 'ruby': ['2.7'], + 'katello': 'KATELLO-4.12' + ], '3.9-stable': [ 'ruby': ['2.7'], 'katello': 'KATELLO-4.11' diff --git a/theforeman.org/pipelines/test/testKatello.groovy b/theforeman.org/pipelines/test/testKatello.groovy index 2b60d473..4df846dd 100644 --- a/theforeman.org/pipelines/test/testKatello.groovy +++ b/theforeman.org/pipelines/test/testKatello.groovy @@ -3,6 +3,10 @@ def katello_versions = [ 'foreman': 'develop', 'ruby': ['2.7'] ], + 'KATELLO-4.12': [ + 'foreman': '3.10-stable', + 'ruby': ['2.7'] + ], 'KATELLO-4.11': [ 'foreman': '3.9-stable', 'ruby': ['2.7'] diff --git a/theforeman.org/pipelines/vars/foreman/3.10.groovy b/theforeman.org/pipelines/vars/foreman/3.10.groovy new file mode 100644 index 00000000..da53c539 --- /dev/null +++ b/theforeman.org/pipelines/vars/foreman/3.10.groovy @@ -0,0 +1,43 @@ +def foreman_version = '3.10' +def git_branch = "${foreman_version}-stable" +def stage_source = 'stagingyum' + +def foreman_client_distros = [ + 'el9', + 'el8', + 'el7' +] +def foreman_el_releases = [ + 'el9', + 'el8' +] +def foreman_debian_releases = ['bullseye', 'focal'] + +def pipelines_deb = [ + 'install': [ + 'debian11', + 'ubuntu2004' + ], + 'upgrade': [ + 'debian11', + 'ubuntu2004' + ] +] + +def pipelines_el = [ + 'install': [ + 'centos8-stream', + 'centos9-stream', + 'almalinux8', + 'almalinux9', + ], + 'upgrade': [ + 'centos8-stream', + 'almalinux8', + ] +] + +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.12.groovy b/theforeman.org/pipelines/vars/katello/4.12.groovy new file mode 100644 index 00000000..3ded463d --- /dev/null +++ b/theforeman.org/pipelines/vars/katello/4.12.groovy @@ -0,0 +1,19 @@ +def foreman_version = '3.10' +def katello_version = '4.12' +def stage_source = 'stagingyum' +def foreman_el_releases = [ + 'el8', + 'el9' +] +def pipelines = [ + 'install': [ + 'centos8-stream', + 'centos9-stream', + 'almalinux8', + 'almalinux9', + ], + 'upgrade': [ + 'centos8-stream', + 'almalinux8', + ] +] diff --git a/theforeman.org/yaml/includes/foreman_versions.yaml.inc b/theforeman.org/yaml/includes/foreman_versions.yaml.inc index efc7ffb8..6125c778 100644 --- a/theforeman.org/yaml/includes/foreman_versions.yaml.inc +++ b/theforeman.org/yaml/includes/foreman_versions.yaml.inc @@ -1,3 +1,4 @@ - '3.7' - '3.8' - '3.9' +- '3.10' diff --git a/theforeman.org/yaml/includes/foreman_versions_copr.yaml.inc b/theforeman.org/yaml/includes/foreman_versions_copr.yaml.inc index befc68b3..61ab3f85 100644 --- a/theforeman.org/yaml/includes/foreman_versions_copr.yaml.inc +++ b/theforeman.org/yaml/includes/foreman_versions_copr.yaml.inc @@ -1 +1,2 @@ - '3.9' +- '3.10' diff --git a/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml b/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml index 384086bb..1ca0c261 100644 --- a/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml +++ b/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml @@ -21,3 +21,4 @@ - '4.9' - '4.10' - '4.11' + - '4.12' diff --git a/theforeman.org/yaml/jobs/test_3_10_stable.yaml b/theforeman.org/yaml/jobs/test_3_10_stable.yaml new file mode 100644 index 00000000..5c670945 --- /dev/null +++ b/theforeman.org/yaml/jobs/test_3_10_stable.yaml @@ -0,0 +1,33 @@ +- job: + name: test_3_10_stable + project-type: matrix + quiet-period: 2700 + properties: + - github_foreman + scm: + - foreman: + branch: '3.10-stable' + triggers: + - scm_fifteen_minutes + - github + axes: + - axis: + type: user-defined + name: ruby + values: + - 2.7 + - axis: + type: label-expression + name: slave + values: + - fast + builders: + - test_develop + publishers: + - gemset_cleanup + - ircbot_freenode + - archive: + artifacts: 'pkg/*,Gemfile.lock,package-lock.json' + only-if-success: false + - junit: + results: 'jenkins/reports/unit/*.xml' diff --git a/theforeman.org/yaml/views/release.yml b/theforeman.org/yaml/views/release.yml index 93179691..915c7383 100644 --- a/theforeman.org/yaml/views/release.yml +++ b/theforeman.org/yaml/views/release.yml @@ -14,6 +14,7 @@ - '7' - '8' - '9' + - '10' - view: name: 'Foreman Nightly'