Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run pipelines in parallel #127

Merged
merged 3 commits into from
Feb 5, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ghaf-hw-test.groovy
Original file line number Diff line number Diff line change
@@ -74,7 +74,6 @@ def ghaf_robot_test(String testname='boot') {

pipeline {
agent { label "${params.getOrDefault('LABEL', DEF_LABEL)}" }
options { timestamps () }
stages {
stage('Checkout') {
steps {
10 changes: 5 additions & 5 deletions ghaf-main-pipeline.groovy
Original file line number Diff line number Diff line change
@@ -75,8 +75,6 @@ pipeline {
pollSCM('* * * * *')
}
options {
disableConcurrentBuilds()
timestamps ()
buildDiscarder(logRotator(numToKeepStr: '100'))
}
stages {
@@ -100,9 +98,11 @@ pipeline {
stage('Evaluate') {
steps {
dir(WORKDIR) {
script {
utils.nix_eval_jobs(targets)
target_jobs = utils.create_parallel_stages(targets, testset='_boot_bat_', failedTargets=failedTargets, failedHWTests=failedHWTests)
lock('evaluator') {
script {
utils.nix_eval_jobs(targets)
target_jobs = utils.create_parallel_stages(targets, testset='_boot_bat_', failedTargets=failedTargets, failedHWTests=failedHWTests)
}
}
}
}
18 changes: 9 additions & 9 deletions ghaf-nightly-pipeline.groovy
Original file line number Diff line number Diff line change
@@ -140,8 +140,6 @@ pipeline {
}

options {
disableConcurrentBuilds()
timestamps ()
buildDiscarder(logRotator(numToKeepStr: '100'))
}

@@ -168,13 +166,15 @@ pipeline {
stage('Evaluate') {
steps {
dir(WORKDIR) {
script {
utils.nix_eval_jobs(targets)
// remove when hydrajobs is retired from ghaf
utils.nix_eval_hydrajobs(hydrajobs_targets)
targets = targets + hydrajobs_targets

target_jobs = utils.create_parallel_stages(targets, testset=null)
lock('evaluator') {
script {
utils.nix_eval_jobs(targets)
// remove when hydrajobs is retired from ghaf
utils.nix_eval_hydrajobs(hydrajobs_targets)
targets = targets + hydrajobs_targets

target_jobs = utils.create_parallel_stages(targets, testset=null)
}
}
}
}
10 changes: 5 additions & 5 deletions ghaf-pre-merge-pipeline.groovy
Original file line number Diff line number Diff line change
@@ -100,8 +100,6 @@ def targets = [
pipeline {
agent { label 'built-in' }
options {
disableConcurrentBuilds()
timestamps ()
buildDiscarder(logRotator(numToKeepStr: '100'))
}
stages {
@@ -178,9 +176,11 @@ pipeline {
stage('Evaluate') {
steps {
dir(WORKDIR) {
script {
utils.nix_eval_jobs(targets)
target_jobs = utils.create_parallel_stages(targets, testset='_boot_pre-merge_')
lock('evaluator') {
script {
utils.nix_eval_jobs(targets)
target_jobs = utils.create_parallel_stages(targets, testset='_boot_pre-merge_')
}
}
}
}
9 changes: 5 additions & 4 deletions ghaf-release-pipeline.groovy
Original file line number Diff line number Diff line change
@@ -86,7 +86,6 @@ def targets = [
pipeline {
agent { label 'built-in' }
options {
disableConcurrentBuilds()
timestamps ()
buildDiscarder(logRotator(numToKeepStr: '100'))
}
@@ -116,9 +115,11 @@ pipeline {
stage('Evaluate') {
steps {
dir(WORKDIR) {
script {
utils.nix_eval_jobs(targets)
target_jobs = utils.create_parallel_stages(targets, testset=null)
lock('evaluator') {
script {
utils.nix_eval_jobs(targets)
target_jobs = utils.create_parallel_stages(targets, testset=null)
}
}
}
}
1 change: 0 additions & 1 deletion tests/x-ghaf-hw-test.groovy
Original file line number Diff line number Diff line change
@@ -139,7 +139,6 @@ def ghaf_robot_test(String test_tags) {

pipeline {
agent { label parse_image_url_and_set_device() }
options { timestamps () }
stages {
stage('Refresh') {
when { expression { params.getOrDefault('REFRESH', false) } }
1 change: 0 additions & 1 deletion tests/x-ghaf-pre-merge.groovy
Original file line number Diff line number Diff line change
@@ -87,7 +87,6 @@ pipeline {
agent { label 'built-in' }
options {
disableConcurrentBuilds()
timestamps ()
buildDiscarder(logRotator(numToKeepStr: '100'))
}
environment {