laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/30534 )
Change subject: jobs/master-builds,gerrit-verifications: fix node
......................................................................
jobs/master-builds,gerrit-verifications: fix node
Do not set a node for master-builds and gerrit-verifications to run on,
as this leads to needlessly blocking slots on the jenkins nodes.
Each of these jobs is a matrix job with a slave_axis. The matrix job
itself can run on the "builtin" node, as it practically doesn't cause
load - all it does is start other jobs in the matrix (even if there is
only one other job, which is the default). Jobs started in the matrix
job do run on a configured node already, as the slave_axis parameter is
set.
I've just noticed this problem because currently the raspberry pi nodes
are offline, and so the master-osmo-trx, master-osmo-pcu and other jobs
take up lots of build slots just to wait until the raspberry pi nodes
come online and an actual build can start.
Change-Id: I447dd152fcc942ec48d0bcfbadd496e879c882da
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 1 insertion(+), 6 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 24dc80d..10cc91b 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -31,7 +31,6 @@
# following default values can be overridden by each repo
disabled: false
concurrent: true
- node: osmocom-gerrit
# axes related defaults
slave_axis: !!python/tuple [osmocom-gerrit]
a1_name: a1
@@ -583,7 +582,6 @@
- job-template:
name: 'gerrit-{repos}-build'
project-type: matrix
- node: '{node}'
concurrent: '{obj:concurrent}'
disabled: '{obj:disabled}'
retry-count: 3 # scm checkout
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 8be2d20..fc713ed 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -5,7 +5,6 @@
# following default values can be overridden by each repo
disabled: false
concurrent: true
- node: 'osmocom-master'
# axes related defaults
slave_axis: !!python/tuple [osmocom-master]
a1_name: a1
@@ -295,8 +294,7 @@
git_base_url:
https://gitea.osmocom.org/satellite
email: jenkins-notifications(a)lists.osmocom.org 246tnt(a)gmail.com
- - osmo-gsm-manuals:
- node: 'osmocom-master'
+ - osmo-gsm-manuals
- osmo-gsm-tester:
cmd: '{docker_run} {docker_img} {timeout_cmd}
/build/contrib/jenkins-build-manuals.sh'
@@ -495,7 +493,6 @@
sequential: '{obj:sequential}'
combination-filter: |
{obj:combination_filter}
- node: '{obj:node}'
axes:
- axis:
type: slave
--
To view, visit
https://gerrit.osmocom.org/c/osmo-ci/+/30534
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I447dd152fcc942ec48d0bcfbadd496e879c882da
Gerrit-Change-Number: 30534
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged