From 754dbd456bca3e0cd636706b0e3f92eea83fd911 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 25 May 2022 13:29:35 -0400 Subject: [PATCH] Use Jenkins' 'built-in' magic phrase MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit https://www.jenkins.io/changelog-stable/#v2.319.1 I don't know if it's a bug or what but giving the controller a "controller" label and instructing the jobs to run on that label only, they would still get stuck on `(pending—Waiting for next available executor on ‘builtin’)`. Signed-off-by: David Galloway --- ceph-dev-build/config/definitions/ceph-dev-build.yml | 2 +- ceph-dev-cron/config/definitions/ceph-dev-cron.yml | 2 +- ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml | 2 +- .../config/definitions/ceph-dev-new-trigger.yml | 2 +- ceph-dev-new/config/definitions/ceph-dev-new.yml | 2 +- ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml | 2 +- ceph-dev/config/definitions/ceph-dev.yml | 2 +- .../config/definitions/ceph-iscsi-cli-trigger.yml | 2 +- .../config/definitions/ceph-iscsi-config-trigger.yml | 2 +- .../config/definitions/ceph-iscsi-tools-trigger.yml | 2 +- ceph-iscsi-trigger/config/definitions/ceph-iscsi-trigger.yml | 2 +- ceph-pr-arm-trigger/config/definitions/ceph-pr-arm-trigger.yml | 2 +- kernel-trigger/config/definitions/kernel-trigger.yml | 2 +- mita-deploy/config/definitions/mita-deploy.yml | 2 +- rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml | 2 +- samba-trigger/config/definitions/samba-trigger.yml | 2 +- tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml index 8c3fa746..2e81fb0d 100644 --- a/ceph-dev-build/config/definitions/ceph-dev-build.yml +++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml @@ -1,6 +1,6 @@ - job: name: ceph-dev-build - node: controller + node: built-in project-type: matrix defaults: global display-name: 'ceph-dev-build' diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml index 94195644..41e5baa5 100644 --- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml +++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml @@ -1,6 +1,6 @@ - job: name: 'ceph-dev-cron' - node: controller + node: built-in project-type: freestyle defaults: global concurrent: true diff --git a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml index d89ac302..97da4080 100644 --- a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml +++ b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml @@ -1,6 +1,6 @@ - job: name: ceph-dev-new-build - node: controller + node: built-in project-type: matrix defaults: global display-name: 'ceph-dev-new-build' diff --git a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml index f65f4179..7bef59ec 100644 --- a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml +++ b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml @@ -1,6 +1,6 @@ - job: name: ceph-dev-new-trigger - node: controller + node: built-in project-type: freestyle defaults: global quiet-period: 5 diff --git a/ceph-dev-new/config/definitions/ceph-dev-new.yml b/ceph-dev-new/config/definitions/ceph-dev-new.yml index 0700e9bd..bdb0f723 100644 --- a/ceph-dev-new/config/definitions/ceph-dev-new.yml +++ b/ceph-dev-new/config/definitions/ceph-dev-new.yml @@ -1,7 +1,7 @@ - job: name: ceph-dev-new description: 'This job builds branches from https://github.com/ceph/ceph-ci for testing purposes.' - node: controller + node: built-in project-type: multijob defaults: global concurrent: true diff --git a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml index 61a928a3..78077e83 100644 --- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml +++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml @@ -1,7 +1,7 @@ - job: disabled: true name: ceph-dev-trigger - node: controller + node: built-in project-type: freestyle defaults: global quiet-period: 5 diff --git a/ceph-dev/config/definitions/ceph-dev.yml b/ceph-dev/config/definitions/ceph-dev.yml index 628469b0..464a5609 100644 --- a/ceph-dev/config/definitions/ceph-dev.yml +++ b/ceph-dev/config/definitions/ceph-dev.yml @@ -1,7 +1,7 @@ - job: name: ceph-dev description: 'This job builds branches from https://github.com/ceph/ceph for testing purposes.' - node: controller + node: built-in project-type: multijob defaults: global concurrent: true diff --git a/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml b/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml index b9cd8100..281eb864 100644 --- a/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml +++ b/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml @@ -1,6 +1,6 @@ - job: name: ceph-iscsi-cli-trigger - node: controller + node: built-in project-type: freestyle defaults: global quiet-period: 5 diff --git a/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml b/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml index fd5c9a5f..b8d46cde 100644 --- a/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml +++ b/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml @@ -1,6 +1,6 @@ - job: name: ceph-iscsi-config-trigger - node: controller + node: built-in project-type: freestyle defaults: global quiet-period: 5 diff --git a/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml b/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml index 904dfa99..711c5ebd 100644 --- a/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml +++ b/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml @@ -1,6 +1,6 @@ - job: name: ceph-iscsi-tools-trigger - node: controller + node: built-in project-type: freestyle defaults: global quiet-period: 5 diff --git a/ceph-iscsi-trigger/config/definitions/ceph-iscsi-trigger.yml b/ceph-iscsi-trigger/config/definitions/ceph-iscsi-trigger.yml index 75fd374c..65fd7707 100644 --- a/ceph-iscsi-trigger/config/definitions/ceph-iscsi-trigger.yml +++ b/ceph-iscsi-trigger/config/definitions/ceph-iscsi-trigger.yml @@ -1,6 +1,6 @@ - job: name: ceph-iscsi-trigger - node: controller + node: built-in project-type: freestyle defaults: global quiet-period: 5 diff --git a/ceph-pr-arm-trigger/config/definitions/ceph-pr-arm-trigger.yml b/ceph-pr-arm-trigger/config/definitions/ceph-pr-arm-trigger.yml index ff13b19b..eadecd0b 100644 --- a/ceph-pr-arm-trigger/config/definitions/ceph-pr-arm-trigger.yml +++ b/ceph-pr-arm-trigger/config/definitions/ceph-pr-arm-trigger.yml @@ -1,6 +1,6 @@ - job: name: ceph-pr-arm-trigger - node: controller + node: built-in # disabled for now because this is not passing the right BRANCH to # `ceph-dev` which causes failures there disabled: true diff --git a/kernel-trigger/config/definitions/kernel-trigger.yml b/kernel-trigger/config/definitions/kernel-trigger.yml index c3791b2a..1f8acd11 100644 --- a/kernel-trigger/config/definitions/kernel-trigger.yml +++ b/kernel-trigger/config/definitions/kernel-trigger.yml @@ -1,6 +1,6 @@ - job: name: kernel-trigger - node: controller + node: built-in project-type: freestyle defaults: global quiet-period: 5 diff --git a/mita-deploy/config/definitions/mita-deploy.yml b/mita-deploy/config/definitions/mita-deploy.yml index 5db71d24..66b41967 100644 --- a/mita-deploy/config/definitions/mita-deploy.yml +++ b/mita-deploy/config/definitions/mita-deploy.yml @@ -12,7 +12,7 @@ - job: name: mita-deploy - node: controller + node: built-in description: "This job clones mita and deploys it to its production server based on the BRANCH value" display-name: 'mita-deploy' block-downstream: false diff --git a/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml b/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml index b8151283..6f043fd0 100644 --- a/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml +++ b/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml @@ -1,6 +1,6 @@ - job: name: rtslib-fb-trigger - node: controller + node: built-in project-type: freestyle defaults: global quiet-period: 5 diff --git a/samba-trigger/config/definitions/samba-trigger.yml b/samba-trigger/config/definitions/samba-trigger.yml index f71c6e49..7c3e4c47 100644 --- a/samba-trigger/config/definitions/samba-trigger.yml +++ b/samba-trigger/config/definitions/samba-trigger.yml @@ -1,6 +1,6 @@ - job: name: samba-trigger - node: controller + node: built-in project-type: freestyle defaults: global quiet-period: 5 diff --git a/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml b/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml index a566567b..960d27b1 100644 --- a/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml +++ b/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml @@ -1,6 +1,6 @@ - job: name: tcmu-runner-trigger - node: controller + node: built-in project-type: freestyle defaults: global quiet-period: 5 -- 2.39.5