From 16392c5e0c9a6334291ba03e68541085183c3b1e Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Thu, 27 Jun 2024 14:04:40 +0200 Subject: [PATCH] Drop Foreman 3.9 & Katello 4.11 pipelines --- centos.org/jobs/foreman-pipelines.yml | 1 - centos.org/jobs/katello-pipelines.yml | 1 - .../pipelines/vars/foreman/3.9.groovy | 37 ------------------- .../pipelines/vars/katello/4.11.groovy | 13 ------- .../yaml/includes/foreman_versions.yaml.inc | 1 - .../includes/foreman_versions_copr.yaml.inc | 1 - .../jobs/pipeline/katello-rpm-pipeline.yaml | 1 - theforeman.org/yaml/jobs/test_3_9_stable.yaml | 31 ---------------- theforeman.org/yaml/views/release.yml | 1 - 9 files changed, 87 deletions(-) delete mode 100644 theforeman.org/pipelines/vars/foreman/3.9.groovy delete mode 100644 theforeman.org/pipelines/vars/katello/4.11.groovy delete 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 43297511..ada0b516 100644 --- a/centos.org/jobs/foreman-pipelines.yml +++ b/centos.org/jobs/foreman-pipelines.yml @@ -8,7 +8,6 @@ - deb - rpm version: - - '3.9' - '3.10' - '3.11' - nightly diff --git a/centos.org/jobs/katello-pipelines.yml b/centos.org/jobs/katello-pipelines.yml index a975a9d2..1b5ce01d 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.11' - '4.12' - '4.13' - 'nightly' diff --git a/theforeman.org/pipelines/vars/foreman/3.9.groovy b/theforeman.org/pipelines/vars/foreman/3.9.groovy deleted file mode 100644 index 90e2c106..00000000 --- a/theforeman.org/pipelines/vars/foreman/3.9.groovy +++ /dev/null @@ -1,37 +0,0 @@ -def foreman_version = '3.9' -def git_branch = "${foreman_version}-stable" - -def foreman_client_distros = [ - 'el9', - 'el8', - 'el7' -] -def foreman_el_releases = [ - 'el8' -] -def foreman_debian_releases = ['bullseye', 'focal'] - -def pipelines_deb = [ - 'install': [ - 'debian11', - 'ubuntu2004' - ], - 'upgrade': [ - 'debian11', - 'ubuntu2004' - ] -] - -def pipelines_el = [ - 'install': [ - 'almalinux8', - ], - 'upgrade': [ - '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 deleted file mode 100644 index 15f0f43c..00000000 --- a/theforeman.org/pipelines/vars/katello/4.11.groovy +++ /dev/null @@ -1,13 +0,0 @@ -def foreman_version = '3.9' -def katello_version = '4.11' -def foreman_el_releases = [ - 'el8' -] -def pipelines = [ - 'install': [ - 'almalinux8', - ], - 'upgrade': [ - 'almalinux8', - ] -] diff --git a/theforeman.org/yaml/includes/foreman_versions.yaml.inc b/theforeman.org/yaml/includes/foreman_versions.yaml.inc index f6fd6435..bb91c090 100644 --- a/theforeman.org/yaml/includes/foreman_versions.yaml.inc +++ b/theforeman.org/yaml/includes/foreman_versions.yaml.inc @@ -1,3 +1,2 @@ -- '3.9' - '3.10' - '3.11' diff --git a/theforeman.org/yaml/includes/foreman_versions_copr.yaml.inc b/theforeman.org/yaml/includes/foreman_versions_copr.yaml.inc index f6fd6435..bb91c090 100644 --- a/theforeman.org/yaml/includes/foreman_versions_copr.yaml.inc +++ b/theforeman.org/yaml/includes/foreman_versions_copr.yaml.inc @@ -1,3 +1,2 @@ -- '3.9' - '3.10' - '3.11' diff --git a/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml b/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml index a72d6784..4f253445 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.11' - '4.12' - '4.13' diff --git a/theforeman.org/yaml/jobs/test_3_9_stable.yaml b/theforeman.org/yaml/jobs/test_3_9_stable.yaml deleted file mode 100644 index 24b7b4f5..00000000 --- a/theforeman.org/yaml/jobs/test_3_9_stable.yaml +++ /dev/null @@ -1,31 +0,0 @@ -- 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.6' - - axis: - type: label-expression - name: slave - values: - - fast - builders: - - test_develop - publishers: - - 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 f84ccb06..e81a51ee 100644 --- a/theforeman.org/yaml/views/release.yml +++ b/theforeman.org/yaml/views/release.yml @@ -11,7 +11,6 @@ major: - '3' minor: - - '9' - '10' - '11'