Skip to content

Commit f54cfb8

Browse files
authored
Merge branch 'master' into jrivero/remove_the_longest_token_ever
2 parents ccf062b + 374fd4e commit f54cfb8

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

jenkins-scripts/dsl/gazebo.dsl

+9-1
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,15 @@ all_debbuild_branches.each { branch ->
436436
}
437437
}
438438

439+
// - SOURCE jobs ---------------------------------------------------
440+
def gz_source_job = job("gazebo11-source")
441+
OSRFSourceCreation.create(gz_source_job, [
442+
PACKAGE: 'gazebo11',
443+
SOURCE_REPO_URI: "https://github.com/gazebosim/gazebo-classic.git"])
444+
OSRFSourceCreation.call_uploader_and_releasepy(gz_source_job,
445+
'repository_uploader_packages',
446+
'_releasepy')
447+
439448
// --------------------------------------------------------------
440449
// BREW: CI jobs
441450

@@ -446,7 +455,6 @@ OSRFBrewCompilationAnyGitHub.create(gazebo_brew_ci_any_job, "gazebosim/gazebo-cl
446455
gazebo_brew_ci_any_job.with
447456
{
448457
label Globals.nontest_label("osx")
449-
450458
steps {
451459
shell("""\
452460
#!/bin/bash -xe

jenkins-scripts/tools/label-assignment-backstop.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ for (tup in exactly_one_labels) {
4949
println("Appointing a node from the configured pool matching '${pool_label}'")
5050

5151
def node_pool = Jenkins.instance.nodes.findAll { node ->
52-
node.computer.online &&
52+
node.toComputer()?.isOnline() &&
5353
node.getLabelString().contains(pool_label) &&
5454
!node.getLabelString().contains(nightly_label_prefix) &&
5555
!node.getLabelString().contains("test-instance")
@@ -58,7 +58,7 @@ for (tup in exactly_one_labels) {
5858
if (node_pool.size() <= 0) {
5959
println("The Pool of '${pool_label}' machines for ${nightly_label} is empty. Reusing a node:")
6060
node_pool = Jenkins.instance.nodes.findAll { node ->
61-
node.computer.online &&
61+
node.toComputer()?.isOnline() &&
6262
node.getLabelString().contains(pool_label) &&
6363
!node.getLabelString().contains("test-instance")
6464
}

jenkins-scripts/tools/outdated-job-runner.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def findAvailableNodes() {
2727
def availableNodes = [osx: [], win: [], docker: []]
2828

2929
Jenkins.instance.nodes.each { node ->
30-
if (node.computer.online && node.computer.countIdle() > 0) {
30+
if (node.toComputer()?.isOnline() && node.computer.countIdle() > 0) {
3131
if (node.getLabelString().contains("win")) {
3232
availableNodes.win << node.name
3333
} else if (node.getLabelString().contains("osx")) {

0 commit comments

Comments
 (0)