diff --git a/theforeman.org/pipelines/release/source/foreman-installer.groovy b/theforeman.org/pipelines/release/source/foreman-installer.groovy index 52573531..63045a47 100644 --- 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 index 7b739a8c..fec821d5 100644 --- a/theforeman.org/pipelines/test/foreman-installer.groovy +++ b/theforeman.org/pipelines/test/foreman-installer.groovy @@ -12,11 +12,34 @@ pipeline { axes { axis { name 'ruby' - values '2.5' + values '2.5', '2.7' + } + axis { + name 'PUPPET_VERSION' + values '6', '7' } } - environment { - PUPPET_VERSION = '6.0' + excludes { + exclude { + axis { + name 'ruby' + values '2.7' + } + axis { + name 'PUPPET_VERSION' + values '6' + } + } + exclude { + axis { + name 'ruby' + values '2.5' + } + axis { + name 'PUPPET_VERSION' + values '7' + } + } } stages { stage('Setup Git Repos') { diff --git a/theforeman.org/pipelines/test/kafo.groovy b/theforeman.org/pipelines/test/kafo.groovy index efe9e19b..f25c4c93 100644 --- a/theforeman.org/pipelines/test/kafo.groovy +++ b/theforeman.org/pipelines/test/kafo.groovy @@ -11,11 +11,33 @@ pipeline { axes { axis { name 'ruby' - values '2.4', '2.5', '2.6' + values '2.5', '2.7' } axis { name 'PUPPET_VERSION' - values '5.0', '6.0' + values '6', '7' + } + } + excludes { + exclude { + axis { + name 'ruby' + values '2.7' + } + axis { + name 'PUPPET_VERSION' + values '6' + } + } + exclude { + axis { + name 'ruby' + values '2.5' + } + axis { + name 'PUPPET_VERSION' + values '7' + } } } stages {