drop Foreman 2.4 and Katello 4.0

theforeman · Dec 10, 2021 · 47c3753 · 47c3753
1 parent 30d5cdf
commit 47c3753
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 164 deletions.
diff --git a/centos.org/jobs/foreman-pipelines.yml b/centos.org/jobs/foreman-pipelines.yml
@@ -12,7 +12,6 @@
       - ubuntu1804
       - ubuntu2004
     version:
-      - '2.4'
       - '2.5'
       - '3.0'
     action:

diff --git a/centos.org/jobs/katello-pipelines.yml b/centos.org/jobs/katello-pipelines.yml
@@ -1,33 +1,4 @@
 ---
-- project:
-    name: katello-release-4.0-install
-    jobs:
-      - 'foreman-pipeline-{type}-{version}-{distro}-{action}'
-    empty: ''
-    version:
-      - '4.0'
-    distro:
-      - centos7
-      - centos8
-    action:
-      - install
-    type:
-      - katello
-
-- project:
-    name: katello-release-4.0-upgrade
-    jobs:
-      - 'foreman-pipeline-{type}-{version}-{distro}-{action}'
-    empty: ''
-    version:
-      - '4.0'
-    distro:
-      - centos7
-    action:
-      - upgrade
-    type:
-      - katello
-
 - project:
     name: katello-release-4.1
     jobs:

diff --git a/theforeman.org/pipelines/release/pipelines/katello.groovy b/theforeman.org/pipelines/release/pipelines/katello.groovy
@@ -44,9 +44,6 @@ pipeline {
 
             steps {
                 script {
-                    if (katello_version in ['4.0']) {
-                        push_rpms_katello(katello_version)
-                    }
                     foreman_el_releases.each { distro ->
                         push_katello_rpms(katello_version, distro)
                     }

diff --git a/theforeman.org/pipelines/test/testKatello.groovy b/theforeman.org/pipelines/test/testKatello.groovy
@@ -15,10 +15,6 @@ def katello_versions = [
         'foreman': '2.5-stable',
         'ruby': ['2.7']
     ],
-    'KATELLO-4.0': [
-        'foreman': '2.4-stable',
-        'ruby': ['2.5']
-    ],
 ]
 
 def ruby_versions = katello_versions[ghprbTargetBranch]['ruby']

diff --git a/theforeman.org/pipelines/vars/foreman/2.4.groovy b/theforeman.org/pipelines/vars/foreman/2.4.groovy
diff --git a/theforeman.org/pipelines/vars/katello/4.0.groovy b/theforeman.org/pipelines/vars/katello/4.0.groovy
diff --git a/theforeman.org/yaml/includes/foreman_versions.yaml.inc b/theforeman.org/yaml/includes/foreman_versions.yaml.inc
@@ -1,4 +1,3 @@
-- '2.4'
 - '2.5'
 - '3.0'
 - '3.1'
diff --git a/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml b/theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml
@@ -18,7 +18,6 @@
       - 'katello-{version}-rpm-pipeline'
     empty: ''
     version:
-      - '4.0'
       - '4.1'
       - '4.2'
       - '4.3'
diff --git a/theforeman.org/yaml/jobs/test_2_4_stable.yaml b/theforeman.org/yaml/jobs/test_2_4_stable.yaml
diff --git a/theforeman.org/yaml/jobs/test_proxy_2_4_stable.yaml b/theforeman.org/yaml/jobs/test_proxy_2_4_stable.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,6 @@ @@
           - ubuntu1804
           - ubuntu2004
         version:
-          - '2.4'
           - '2.5'
           - '3.0'
         action:
@@ Expand Down @@