diff --git a/centos.org/jobs/foreman-pipelines.yml b/centos.org/jobs/foreman-pipelines.yml index ada0b516..80e2bcac 100644 --- a/centos.org/jobs/foreman-pipelines.yml +++ b/centos.org/jobs/foreman-pipelines.yml @@ -8,7 +8,6 @@ - deb - rpm version: - - '3.10' - '3.11' - nightly type: diff --git a/centos.org/jobs/katello-pipelines.yml b/centos.org/jobs/katello-pipelines.yml index 1b5ce01d..4651e895 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.12' - '4.13' - 'nightly' type: diff --git a/theforeman.org/pipelines/vars/foreman/3.10.groovy b/theforeman.org/pipelines/vars/foreman/3.10.groovy deleted file mode 100644 index 9e44ae7c..00000000 --- a/theforeman.org/pipelines/vars/foreman/3.10.groovy +++ /dev/null @@ -1,40 +0,0 @@ -def foreman_version = '3.10' -def git_branch = "${foreman_version}-stable" - -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': [ - 'centos9-stream', - 'almalinux8', - 'almalinux9', - ], - '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.12.groovy b/theforeman.org/pipelines/vars/katello/4.12.groovy deleted file mode 100644 index 13790d2f..00000000 --- a/theforeman.org/pipelines/vars/katello/4.12.groovy +++ /dev/null @@ -1,16 +0,0 @@ -def foreman_version = '3.10' -def katello_version = '4.12' -def foreman_el_releases = [ - 'el8', - 'el9' -] -def pipelines = [ - 'install': [ - 'centos9-stream', - 'almalinux8', - 'almalinux9', - ], - 'upgrade': [ - 'almalinux8', - ] -] diff --git a/theforeman.org/yaml/includes/foreman_versions.yaml.inc b/theforeman.org/yaml/includes/foreman_versions.yaml.inc index bb91c090..0af2f05e 100644 --- a/theforeman.org/yaml/includes/foreman_versions.yaml.inc +++ b/theforeman.org/yaml/includes/foreman_versions.yaml.inc @@ -1,2 +1 @@ -- '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 bb91c090..0af2f05e 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.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 4f253445..6041b1a2 100644 --- a/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml +++ b/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml @@ -18,5 +18,4 @@ - 'katello-{version}-rpm-pipeline' empty: '' version: - - '4.12' - '4.13'