From ddf34fa1da4021e798574e0e4952a7053c121a31 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Fri, 22 Mar 2024 18:32:39 +0100 Subject: [PATCH] Drop Foreman 3.8/Katello 4.10 pipelines --- centos.org/jobs/foreman-pipelines.yml | 1 - centos.org/jobs/katello-pipelines.yml | 1 - .../pipelines/test/foreman/vars.groovy | 9 ---- .../pipelines/test/testKatello.groovy | 4 -- .../pipelines/vars/foreman/3.8.groovy | 41 ------------------- .../pipelines/vars/katello/4.10.groovy | 16 -------- .../yaml/includes/foreman_versions.yaml.inc | 1 - .../jobs/pipeline/katello-rpm-pipeline.yaml | 1 - theforeman.org/yaml/jobs/test_3_8_stable.yaml | 33 --------------- 9 files changed, 107 deletions(-) delete mode 100644 theforeman.org/pipelines/vars/foreman/3.8.groovy delete mode 100644 theforeman.org/pipelines/vars/katello/4.10.groovy delete mode 100644 theforeman.org/yaml/jobs/test_3_8_stable.yaml diff --git a/centos.org/jobs/foreman-pipelines.yml b/centos.org/jobs/foreman-pipelines.yml index 08064055..b3447990 100644 --- a/centos.org/jobs/foreman-pipelines.yml +++ b/centos.org/jobs/foreman-pipelines.yml @@ -8,7 +8,6 @@ - deb - rpm version: - - '3.8' - '3.9' - '3.10' - nightly diff --git a/centos.org/jobs/katello-pipelines.yml b/centos.org/jobs/katello-pipelines.yml index dbbafb84..0c582bb0 100644 --- a/centos.org/jobs/katello-pipelines.yml +++ b/centos.org/jobs/katello-pipelines.yml @@ -5,7 +5,6 @@ - 'foreman-pipeline-{type}-{flavor}-{version}' empty: '' version: - - '4.10' - '4.11' - '4.12' - 'nightly' diff --git a/theforeman.org/pipelines/test/foreman/vars.groovy b/theforeman.org/pipelines/test/foreman/vars.groovy index 64028ae2..2fbd75d4 100644 --- a/theforeman.org/pipelines/test/foreman/vars.groovy +++ b/theforeman.org/pipelines/test/foreman/vars.groovy @@ -11,10 +11,6 @@ def foreman_integration_versions = [ 'ruby': ['2.7'], 'katello': 'KATELLO-4.11' ], - '3.8-stable': [ - 'ruby': ['2.7'], - 'katello': 'KATELLO-4.10' - ], ] def foreman_unit_versions = [ @@ -29,9 +25,4 @@ def foreman_unit_versions = [ '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 18436af0..5fee2083 100644 --- a/theforeman.org/pipelines/test/testKatello.groovy +++ b/theforeman.org/pipelines/test/testKatello.groovy @@ -11,10 +11,6 @@ def katello_versions = [ 'foreman': '3.9-stable', 'ruby': ['2.7'] ], - 'KATELLO-4.10': [ - 'foreman': '3.8-stable', - 'ruby': ['2.7'] - ], ] def ruby_versions = katello_versions[ghprbTargetBranch]['ruby'] diff --git a/theforeman.org/pipelines/vars/foreman/3.8.groovy b/theforeman.org/pipelines/vars/foreman/3.8.groovy deleted file mode 100644 index 524b65fc..00000000 --- a/theforeman.org/pipelines/vars/foreman/3.8.groovy +++ /dev/null @@ -1,41 +0,0 @@ -def foreman_version = '3.8' -def git_branch = "${foreman_version}-stable" -def stage_source = 'koji' - -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.10.groovy b/theforeman.org/pipelines/vars/katello/4.10.groovy deleted file mode 100644 index 3daf6a9b..00000000 --- a/theforeman.org/pipelines/vars/katello/4.10.groovy +++ /dev/null @@ -1,16 +0,0 @@ -def foreman_version = '3.8' -def katello_version = '4.10' -def stage_source = 'koji' -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 ec4ed3eb..61ab3f85 100644 --- a/theforeman.org/yaml/includes/foreman_versions.yaml.inc +++ b/theforeman.org/yaml/includes/foreman_versions.yaml.inc @@ -1,3 +1,2 @@ -- '3.8' - '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 0879c8a1..6475a1d7 100644 --- a/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml +++ b/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml @@ -18,6 +18,5 @@ - 'katello-{version}-rpm-pipeline' empty: '' version: - - '4.10' - '4.11' - '4.12' diff --git a/theforeman.org/yaml/jobs/test_3_8_stable.yaml b/theforeman.org/yaml/jobs/test_3_8_stable.yaml deleted file mode 100644 index 92907c1d..00000000 --- a/theforeman.org/yaml/jobs/test_3_8_stable.yaml +++ /dev/null @@ -1,33 +0,0 @@ -- job: - name: test_3_8_stable - project-type: matrix - quiet-period: 2700 - properties: - - github_foreman - scm: - - foreman: - branch: '3.8-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'