Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: theforeman/jenkins-jobs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d147dd64c92462da6004352a29aca86bb6b1655e
Choose a base ref
...
head repository: theforeman/jenkins-jobs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9de04411fd609c47f8c179535dfaac87324b09c2
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 7, 2025

  1. Rewrite Foreman's testing to a matrix 

    This makes it easier to change the Ruby versions and also test on
multiple at the same time.
    @ekohl
    ekohl committed Jan 7, 2025
    Copy the full SHA
    9de0441 View commit details
Showing with 61 additions and 79 deletions.
  1. +19 −0 theforeman.org/pipelines/lib/foreman.groovy
  2. +42 −79 theforeman.org/pipelines/release/source/foreman.groovy
19 changes: 19 additions & 0 deletions theforeman.org/pipelines/lib/foreman.groovy
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
def databaseUrlForTask(task, env) {
if (task == 'assets:precompile') {
return 'nulldb://nohost'
} else {
// TODO: limit DB name length to < 63 chars
ruby = env.RUBY_VER.split('.')[0..1]
task_id = task.split(':')[1]
database = (['test', env.JOB_NAME, env.BUILD_ID] + ruby + [task_id]).join('-')
if (database.size() > 63) {
error "${id} cannot be used to generate a PostgreSQL DB name, the resulting name would be longer than 63 chars."
}
return "postgresql://foreman:foreman@localhost/${database}"
}
}

def railsEnvForTask(task) {
return task == 'assets:precompile' ? 'production' : 'test'
}

def databaseFile(id) {
text = postgresqlTemplate(id)
writeFile(file: 'config/database.yml', text: text)
121 changes: 42 additions & 79 deletions theforeman.org/pipelines/release/source/foreman.groovy
View file
Original file line number Diff line number Diff line change
@@ -8,98 +8,61 @@ pipeline {
buildDiscarder(logRotator(daysToKeepStr: '7'))
}

environment {
BUNDLE_WITHOUT = 'development'
RAILS_ENV = railsEnvForTask(TASK)
DATABASE_URL = databaseUrlForTask(TASK, env)
TESTOPTS = '-v'
}

stages {
stage('Test Matrix') {
parallel {
stage('ruby-2.7-postgres') {
agent { label 'fast' }
environment {
RUBY_VER = '2.7.6'
matrix {
agent { label 'fast' }
axes {
axis {
name 'RUBY_VER'
values '2.7.6'
}
stages {
stage("setup-2.7-postgres") {
steps {
git url: git_url, branch: git_ref
script {
archive_git_hash()
}
databaseFile("${env.JOB_NAME}-${env.BUILD_ID}")
configureDatabase(env.RUBY_VER)
}
}
stage("unit-tests-2.7-postgres") {
steps {
bundleExec(env.RUBY_VER, 'rake jenkins:unit TESTOPTS="-v" --trace')
}
}
}
post {
always {
junit(testResults: 'jenkins/reports/unit/*.xml')
}
cleanup {
cleanup(env.RUBY_VER)
deleteDir()
}
axis {
name 'TASK'
values 'jenkins:unit', 'jenkins:integration', 'assets:precompile'
}
}
stage('ruby-2.7-postgres-integrations') {
agent { label 'fast' }
environment {
RUBY_VER = '2.7.6'
}
stages {
stage("setup-2.7-postgres-ui") {
steps {
git url: git_url, branch: git_ref
databaseFile("${env.JOB_NAME}-${env.BUILD_ID}-ui")
configureDatabase(env.RUBY_VER)
withRuby(env.RUBY_VER, 'npm install --no-audit --legacy-peer-deps')
archiveArtifacts(artifacts: 'package-lock.json')
stages {
stage('setup') {
steps {
git url: git_url, branch: git_ref
script {
archive_git_hash()
}
}
stage("integration-tests-2.7-postgres-ui") {
steps {
bundleExec(env.RUBY_VER, 'rake jenkins:integration TESTOPTS="-v" --trace')
bundleInstall(RUBY_VER)
archiveArtifacts(artifacts: 'Gemfile.lock')
script {
if (TASK == 'assets:precompile') {
sh "cp db/schema.rb.nulldb db/schema.rb"
filter_package_json(RUBY_VER)
}
if (TASK == 'jenkins:integration' || TASK == 'assets:precompile' ){
withRuby(RUBY_VER, 'npm install --no-audit --legacy-peer-deps')
archiveArtifacts(artifacts: 'package-lock.json')
}
}
}
}
post {
always {
junit(testResults: 'jenkins/reports/unit/*.xml')
}
cleanup {
cleanup(env.RUBY_VER)
deleteDir()
stage(TASK) {
steps {
bundleExec(RUBY_VER, "rake ${TASK} --trace")
}
}
}
stage('ruby-2.7-nulldb-assets') {
agent { label 'fast' }
environment {
RUBY_VER = '2.7.6'
}
stages {
stage("setup-2.7-nulldb") {
steps {
git url: git_url, branch: git_ref
bundleInstall(env.RUBY_VER, '--without=development')
sh "cp db/schema.rb.nulldb db/schema.rb"
filter_package_json(env.RUBY_VER)
withRuby(env.RUBY_VER, 'npm install --no-audit --legacy-peer-deps')
}
}
stage("assets-precompile-2.7-nulldb") {
steps {
bundleExec(env.RUBY_VER, 'rake assets:precompile RAILS_ENV=production DATABASE_URL=nulldb://nohost')
}
}
post {
always {
junit(testResults: 'jenkins/reports/*/*.xml', allowEmptyResults: TASK == 'assets:precompile')
}
post {
cleanup {
cleanup(env.RUBY_VER)
deleteDir()
}
cleanup {
bundleExec(RUBY_VER, 'rake db:drop DISABLE_DATABASE_ENVIRONMENT_CHECK=true')
deleteDir()
}
}
}