From 1fb5f775a059c778e2dbcbaac1f45df640b55697 Mon Sep 17 00:00:00 2001 From: Zach Huntington-Meath Date: Mon, 20 Nov 2023 10:47:41 -0500 Subject: [PATCH] Add 3.9 and 4.11 jobs for branching --- centos.org/jobs/foreman-pipelines.yml | 1 + .../pipelines/test/foreman/vars.groovy | 8 ++++ .../pipelines/test/testKatello.groovy | 4 ++ .../pipelines/vars/foreman/3.9.groovy | 41 +++++++++++++++++++ .../pipelines/vars/katello/4.11.groovy | 16 ++++++++ .../yaml/includes/foreman_versions.yaml.inc | 1 + theforeman.org/yaml/jobs/test_3_9_stable.yaml | 33 +++++++++++++++ 7 files changed, 104 insertions(+) create mode 100644 theforeman.org/pipelines/vars/foreman/3.9.groovy create mode 100644 theforeman.org/pipelines/vars/katello/4.11.groovy create mode 100644 theforeman.org/yaml/jobs/test_3_9_stable.yaml diff --git a/centos.org/jobs/foreman-pipelines.yml b/centos.org/jobs/foreman-pipelines.yml index 1b4f091e..56fd88af 100644 --- a/centos.org/jobs/foreman-pipelines.yml +++ b/centos.org/jobs/foreman-pipelines.yml @@ -10,6 +10,7 @@ version: - '3.7' - '3.8' + - '3.9' - nightly type: - foreman diff --git a/theforeman.org/pipelines/test/foreman/vars.groovy b/theforeman.org/pipelines/test/foreman/vars.groovy index 61dc9309..eea5aa87 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.9-stable': [ + 'ruby': ['2.7'], + 'katello': 'KATELLO-4.11' + ], '3.8-stable': [ 'ruby': ['2.7'], 'katello': 'KATELLO-4.10' @@ -41,6 +45,10 @@ def foreman_unit_versions = [ 'develop': [ 'ruby': ['2.7'] ], + '3.9-stable': [ + 'ruby': ['2.7'], + 'katello': 'KATELLO-4.11' + ], '3.8-stable': [ 'ruby': ['2.7'], 'katello': 'KATELLO-4.10' diff --git a/theforeman.org/pipelines/test/testKatello.groovy b/theforeman.org/pipelines/test/testKatello.groovy index bfcb600c..42dadaa6 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.11': [ + 'foreman': '3.9-stable', + 'ruby': ['2.7'] + ], 'KATELLO-4.10': [ 'foreman': '3.8-stable', 'ruby': ['2.7'] diff --git a/theforeman.org/pipelines/vars/foreman/3.9.groovy b/theforeman.org/pipelines/vars/foreman/3.9.groovy new file mode 100644 index 00000000..f08d8a8e --- /dev/null +++ b/theforeman.org/pipelines/vars/foreman/3.9.groovy @@ -0,0 +1,41 @@ +def foreman_version = '3.9' +def git_branch = "${foreman_version}-stable" +def stage_source = 'copr' + +def foreman_client_distros = [ + 'el9', + 'el8', + 'el7', + 'sles12' +] +def foreman_el_releases = [ + 'el8' +] +def foreman_debian_releases = ['bullseye', 'focal'] + +def pipelines_deb = [ + 'install': [ + 'debian11', + 'ubuntu2004' + ], + 'upgrade': [ + 'debian11', + 'ubuntu2004' + ] +] + +def pipelines_el = [ + 'install': [ + 'centos8-stream', + 'almalinux8', + ], + '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.11.groovy b/theforeman.org/pipelines/vars/katello/4.11.groovy new file mode 100644 index 00000000..b9d6f30b --- /dev/null +++ b/theforeman.org/pipelines/vars/katello/4.11.groovy @@ -0,0 +1,16 @@ +def foreman_version = '3.9' +def katello_version = '4.11' +def stage_source = 'copr' +def foreman_el_releases = [ + 'el8' +] +def pipelines = [ + 'install': [ + 'centos8-stream', + 'almalinux8', + ], + '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 08e95c39..efc7ffb8 100644 --- a/theforeman.org/yaml/includes/foreman_versions.yaml.inc +++ b/theforeman.org/yaml/includes/foreman_versions.yaml.inc @@ -1,2 +1,3 @@ - '3.7' - '3.8' +- '3.9' diff --git a/theforeman.org/yaml/jobs/test_3_9_stable.yaml b/theforeman.org/yaml/jobs/test_3_9_stable.yaml new file mode 100644 index 00000000..19056d67 --- /dev/null +++ b/theforeman.org/yaml/jobs/test_3_9_stable.yaml @@ -0,0 +1,33 @@ +- job: + name: test_3_9_stable + project-type: matrix + quiet-period: 2700 + properties: + - github_foreman + scm: + - foreman: + branch: '3.9-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'