From 2253f83062e273b03fbf41779c2687c0f3351197 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 23 Nov 2023 14:24:42 -0800 Subject: [PATCH] Reduce usage of the message 'artifact' dict To help with https://pagure.io/fedora-ci/general/issue/436 , this reduces use of the 'artifact' dict from the Bodhi 'update ready for testing' message to only use the 'task_id' values from the 'build' dicts. This will let us simplify the message format in Bodhi. Signed-off-by: Adam Williamson --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a28c44f..69b6321 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,7 +26,7 @@ pipeline { queue: 'osci-pipelines-queue-10' ], checks: [ - [field: '$.artifact.release', expectedValue: '^f[3-9]{1}[0-9]{1}$'] + [field: '$.update.release.dist_tag', expectedValue: '^f[3-9]{1}[0-9]{1}$'] ] ) ] @@ -45,8 +45,8 @@ pipeline { if (msg) { - if (msg['artifact']['builds'].size() > 20) { - echo "There are way too many (${msg['artifact']['builds'].size()} > 20) builds in the update. Skipping..." + if (msg['update']['builds'].size() > 20) { + echo "There are way too many (${msg['update']['builds'].size()} > 20) builds in the update. Skipping..." return } @@ -54,7 +54,7 @@ pipeline { allTaskIds.add(build['task_id']) } - def testProfile = msg['artifact']['release'] + def testProfile = msg['update']['release']['dist_tag'] if (allTaskIds) { allTaskIds.each { taskId ->