diff --git a/centos.org/jobs/foreman-pipelines.yml b/centos.org/jobs/foreman-pipelines.yml index 2d23b3b6..1b4f091e 100644 --- a/centos.org/jobs/foreman-pipelines.yml +++ b/centos.org/jobs/foreman-pipelines.yml @@ -8,9 +8,6 @@ - deb - rpm version: - - '3.4' - - '3.5' - - '3.6' - '3.7' - '3.8' - nightly diff --git a/centos.org/jobs/katello-pipelines.yml b/centos.org/jobs/katello-pipelines.yml index 39754213..e5d323f3 100644 --- a/centos.org/jobs/katello-pipelines.yml +++ b/centos.org/jobs/katello-pipelines.yml @@ -5,9 +5,6 @@ - 'foreman-pipeline-{type}-{flavor}-{version}' empty: '' version: - - '4.6' - - '4.7' - - '4.8' - '4.9' - '4.10' - 'nightly' diff --git a/theforeman.org/pipelines/vars/foreman/3.4.groovy b/theforeman.org/pipelines/vars/foreman/3.4.groovy deleted file mode 100644 index 4310f4e3..00000000 --- a/theforeman.org/pipelines/vars/foreman/3.4.groovy +++ /dev/null @@ -1,42 +0,0 @@ -def foreman_version = '3.4' -def git_branch = "${foreman_version}-stable" -def stage_source = 'koji' - -def foreman_client_distros = [ - 'el9', - 'el8', - 'el7', - 'sles12', - 'sles11' -] -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/foreman/3.5.groovy b/theforeman.org/pipelines/vars/foreman/3.5.groovy deleted file mode 100644 index 189a9dc4..00000000 --- a/theforeman.org/pipelines/vars/foreman/3.5.groovy +++ /dev/null @@ -1,42 +0,0 @@ -def foreman_version = '3.5' -def git_branch = "${foreman_version}-stable" -def stage_source = 'koji' - -def foreman_client_distros = [ - 'el9', - 'el8', - 'el7', - 'sles12', - 'sles11' -] -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/foreman/3.6.groovy b/theforeman.org/pipelines/vars/foreman/3.6.groovy deleted file mode 100644 index 7c1de6b4..00000000 --- a/theforeman.org/pipelines/vars/foreman/3.6.groovy +++ /dev/null @@ -1,42 +0,0 @@ -def foreman_version = '3.6' -def git_branch = "${foreman_version}-stable" -def stage_source = 'koji' - -def foreman_client_distros = [ - 'el9', - 'el8', - 'el7', - 'sles12', - 'sles11' -] -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.6.groovy b/theforeman.org/pipelines/vars/katello/4.6.groovy deleted file mode 100644 index 1dbdcc4a..00000000 --- a/theforeman.org/pipelines/vars/katello/4.6.groovy +++ /dev/null @@ -1,16 +0,0 @@ -def foreman_version = '3.4' -def katello_version = '4.6' -def stage_source = 'koji' -def foreman_el_releases = [ - 'el8' -] -def pipelines = [ - 'install': [ - 'almalinux8', - 'centos8-stream', - ], - 'upgrade': [ - 'almalinux8', - 'centos8-stream', - ] -] diff --git a/theforeman.org/pipelines/vars/katello/4.7.groovy b/theforeman.org/pipelines/vars/katello/4.7.groovy deleted file mode 100644 index f7f8a44c..00000000 --- a/theforeman.org/pipelines/vars/katello/4.7.groovy +++ /dev/null @@ -1,16 +0,0 @@ -def foreman_version = '3.5' -def katello_version = '4.7' -def stage_source = 'koji' -def foreman_el_releases = [ - 'el8' -] -def pipelines = [ - 'install': [ - 'almalinux8', - 'centos8-stream', - ], - 'upgrade': [ - 'almalinux8', - 'centos8-stream', - ] -] diff --git a/theforeman.org/pipelines/vars/katello/4.8.groovy b/theforeman.org/pipelines/vars/katello/4.8.groovy deleted file mode 100644 index f68e11b2..00000000 --- a/theforeman.org/pipelines/vars/katello/4.8.groovy +++ /dev/null @@ -1,16 +0,0 @@ -def foreman_version = '3.6' -def katello_version = '4.8' -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 5adb6b28..08e95c39 100644 --- a/theforeman.org/yaml/includes/foreman_versions.yaml.inc +++ b/theforeman.org/yaml/includes/foreman_versions.yaml.inc @@ -1,5 +1,2 @@ -- '3.4' -- '3.5' -- '3.6' - '3.7' - '3.8' diff --git a/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml b/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml index 73c0257f..0998c60b 100644 --- a/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml +++ b/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml @@ -18,8 +18,5 @@ - 'katello-{version}-rpm-pipeline' empty: '' version: - - '4.6' - - '4.7' - - '4.8' - '4.9' - '4.10' diff --git a/theforeman.org/yaml/jobs/test_3_4_stable.yaml b/theforeman.org/yaml/jobs/test_3_4_stable.yaml deleted file mode 100644 index 07a37a85..00000000 --- a/theforeman.org/yaml/jobs/test_3_4_stable.yaml +++ /dev/null @@ -1,33 +0,0 @@ -- job: - name: test_3_4_stable - project-type: matrix - quiet-period: 2700 - properties: - - github_foreman - scm: - - foreman: - branch: '3.4-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/jobs/test_3_5_stable.yaml b/theforeman.org/yaml/jobs/test_3_5_stable.yaml deleted file mode 100644 index 4343e2f5..00000000 --- a/theforeman.org/yaml/jobs/test_3_5_stable.yaml +++ /dev/null @@ -1,33 +0,0 @@ -- job: - name: test_3_5_stable - project-type: matrix - quiet-period: 2700 - properties: - - github_foreman - scm: - - foreman: - branch: '3.5-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/jobs/test_3_6_stable.yaml b/theforeman.org/yaml/jobs/test_3_6_stable.yaml deleted file mode 100644 index 5cf1cdf8..00000000 --- a/theforeman.org/yaml/jobs/test_3_6_stable.yaml +++ /dev/null @@ -1,33 +0,0 @@ -- job: - name: test_3_6_stable - project-type: matrix - quiet-period: 2700 - properties: - - github_foreman - scm: - - foreman: - branch: '3.6-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 ded550b0..c4c7b758 100644 --- a/theforeman.org/yaml/views/release.yml +++ b/theforeman.org/yaml/views/release.yml @@ -11,10 +11,6 @@ major: - '3' minor: - - '3' - - '4' - - '5' - - '6' - '7' - '8'