Add Ruby 2.7 testing to installer jobs

theforeman · Mar 24, 2021 · 9dd4848 · 9dd4848
1 parent fa60d41
commit 9dd4848
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 5 deletions.
diff --git a/theforeman.org/pipelines/release/source/foreman-installer.groovy b/theforeman.org/pipelines/release/source/foreman-installer.groovy
@@ -22,6 +22,11 @@ pipeline {
                 run_test(ruby: '2.5', puppet: '6.3')
             }
         }
+        stage("test ruby 2.7 & puppet 7") {
+            steps {
+                run_test(ruby: '2.7', puppet: '7')
+            }
+        }
         stage('Build and Archive Source') {
             steps {
                 dir(project_name) {

diff --git a/theforeman.org/pipelines/test/foreman-installer.groovy b/theforeman.org/pipelines/test/foreman-installer.groovy
@@ -12,11 +12,44 @@ pipeline {
                 axes {
                     axis {
                         name 'ruby'
-                        values '2.5'
+                        values '2.4', '2.5', '2.7'
+                    }
+                    axis {
+                        name 'PUPPET_VERSION'
+                        values '5.0', '6.0', '7.0'
                     }
                 }
-                environment {
-                    PUPPET_VERSION = '6.0'
+                excludes {
+                    exclude {
+                        axis {
+                            name 'ruby'
+                            notValues '2.4'
+                        }
+                        axis {
+                            name 'PUPPET_VERSION'
+                            notValues '5.0'
+                        }
+                    }
+                    exclude {
+                        axis {
+                            name 'ruby'
+                            notValues '2.5'
+                        }
+                        axis {
+                            name 'PUPPET_VERSION'
+                            notValues '6.0'
+                        }
+                    }
+                    exclude {
+                        axis {
+                            name 'ruby'
+                            notValues '2.7'
+                        }
+                        axis {
+                            name 'PUPPET_VERSION'
+                            notValues '7.0'
+                        }
+                    }
                 }
                 stages {
                     stage('Setup Git Repos') {

diff --git a/theforeman.org/pipelines/test/kafo.groovy b/theforeman.org/pipelines/test/kafo.groovy
@@ -11,11 +11,43 @@ pipeline {
                 axes {
                     axis {
                         name 'ruby'
-                        values '2.4', '2.5', '2.6'
+                        values '2.4', '2.5', '2.7'
                     }
                     axis {
                         name 'PUPPET_VERSION'
-                        values '5.0', '6.0'
+                        values '5.0', '6.0', '7.0'
+                    }
+                }
+                excludes {
+                    exclude {
+                        axis {
+                            name 'ruby'
+                            notValues '2.4'
+                        }
+                        axis {
+                            name 'PUPPET_VERSION'
+                            notValues '5.0'
+                        }
+                    }
+                    exclude {
+                        axis {
+                            name 'ruby'
+                            notValues '2.5'
+                        }
+                        axis {
+                            name 'PUPPET_VERSION'
+                            notValues '6.0'
+                        }
+                    }
+                    exclude {
+                        axis {
+                            name 'ruby'
+                            notValues '2.7'
+                        }
+                        axis {
+                            name 'PUPPET_VERSION'
+                            notValues '7.0'
+                        }
                     }
                 }
                 stages {