From 7e023279d728aa3eb499f5dcede6089e4936bf50 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Fri, 7 Feb 2025 17:14:47 -0700 Subject: [PATCH 1/9] Use apache httpcomponents client 4 api plugin 4.5.14 269.vfa_2321039a_83 --- plugins.txt | 2 +- ref/plugins/apache-httpcomponents-client-4-api.jpi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins.txt b/plugins.txt index 73a9f6a37..b0696e887 100644 --- a/plugins.txt +++ b/plugins.txt @@ -3,7 +3,7 @@ adoptopenjdk:1.6 analysis-model-api:12.9.1 ant:511.v0a_a_1a_334f41b_ antisamy-markup-formatter:162.v0e6ec0fcfcf6 -apache-httpcomponents-client-4-api:4.5.14-208.v438351942757 +apache-httpcomponents-client-4-api:4.5.14-269.vfa_2321039a_83 apache-httpcomponents-client-5-api:5.4-136.v5a_21779c63f8 asm-api:9.7.1-97.v4cc844130d97 authentication-tokens:1.119.v50285141b_7e1 diff --git a/ref/plugins/apache-httpcomponents-client-4-api.jpi b/ref/plugins/apache-httpcomponents-client-4-api.jpi index 22bd4a020..990e147c4 100644 --- a/ref/plugins/apache-httpcomponents-client-4-api.jpi +++ b/ref/plugins/apache-httpcomponents-client-4-api.jpi @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ed0ccda20a0ea11e2ba5be299f03b30692dd5a2f9fdc7853714507fda8acd0f -size 1774757 +oid sha256:cea2f61cc72890b962fd4b767c31778c6cb30015b4a8758b4c26b62e51ca9533 +size 1774684 From 29857242425c90c7d57b2f823a0fcfb80ad9aea1 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Fri, 7 Feb 2025 17:14:50 -0700 Subject: [PATCH 2/9] Use junit attachments plugin 275.v54db_1ed8e66f --- plugins.txt | 2 +- ref/plugins/junit-attachments.jpi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins.txt b/plugins.txt index b0696e887..78da34b3c 100644 --- a/plugins.txt +++ b/plugins.txt @@ -94,7 +94,7 @@ jquery3-api:3.7.1-2 jsch:0.2.16-86.v42e010d9484b_ json-api:20250107-125.v28b_a_ffa_eb_f01 json-path-api:2.9.0-138.vc943da_d833b_6 -junit-attachments:239.v9e003a_c80a_8c +junit-attachments:275.v54db_1ed8e66f junit-realtime-test-reporter:149.v05a_d403e2f48 junit:1314.vd966e9a_88895 label-verifier:105.vf9d080687b_92 diff --git a/ref/plugins/junit-attachments.jpi b/ref/plugins/junit-attachments.jpi index e50fd8c93..bff6a1d66 100644 --- a/ref/plugins/junit-attachments.jpi +++ b/ref/plugins/junit-attachments.jpi @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:293203e42e8b8af29328c57af2dfd7a3ad531de40756dd44aaedbbef3ea3dfe5 -size 17100 +oid sha256:001dc2a53c0b505d80c1096392e6fa0d045721f1a0d623f2c255fdbab08693e0 +size 17050 From 68c3744c8a337e1677a46331687e84549f8837c4 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Fri, 7 Feb 2025 17:14:53 -0700 Subject: [PATCH 3/9] Use naginator plugin 1.496.v94260e77b_3f5 --- plugins.txt | 2 +- ref/plugins/naginator.jpi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins.txt b/plugins.txt index 78da34b3c..ffd7bb868 100644 --- a/plugins.txt +++ b/plugins.txt @@ -108,7 +108,7 @@ metrics:4.2.21-461.v881e35d8fa_b_a_ mina-sshd-api-common:2.14.0-143.v2b_362fc39576 mina-sshd-api-core:2.14.0-143.v2b_362fc39576 monitoring:2.5.0 -naginator:1.489.v5808b_a_72e0fc +naginator:1.496.v94260e77b_3f5 nodelabelparameter:1.14.0 okhttp-api:4.11.0-183.va_87fc7a_89810 oss-symbols-api:296.v4981240eeb_1a_ diff --git a/ref/plugins/naginator.jpi b/ref/plugins/naginator.jpi index e3b91b335..2c085c761 100644 --- a/ref/plugins/naginator.jpi +++ b/ref/plugins/naginator.jpi @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:babc1df0f505414957dad1f8bd5c922b13de250741c5289c59528c8925fd0533 -size 44889 +oid sha256:df8132378d36f4acc022601ea72a8795fe3db232243fc9dec63539217605bb8c +size 44893 From 6ff37c9c951d9ba406712f3107aab84d394cbbd9 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Fri, 7 Feb 2025 17:14:55 -0700 Subject: [PATCH 4/9] Use workflow cps plugin 4018.vf02e01888da_f --- plugins.txt | 2 +- ref/plugins/workflow-cps.jpi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins.txt b/plugins.txt index ffd7bb868..d2db85647 100644 --- a/plugins.txt +++ b/plugins.txt @@ -164,7 +164,7 @@ warnings-ng:11.12.0 workflow-aggregator:600.vb_57cdd26fdd7 workflow-api:1363.v03f731255494 workflow-basic-steps:1079.vce64b_a_929c5a_ -workflow-cps:4014.vcd7dc51d8b_30 +workflow-cps:4018.vf02e01888da_f workflow-durable-task-step:1405.v1fcd4a_d00096 workflow-job:1498.v33a_0c6f3a_4b_4 workflow-multibranch:800.v5f0a_a_660950e diff --git a/ref/plugins/workflow-cps.jpi b/ref/plugins/workflow-cps.jpi index 51dc854f3..8b258ea94 100644 --- a/ref/plugins/workflow-cps.jpi +++ b/ref/plugins/workflow-cps.jpi @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5c83c789603506f4fcf2d08d84d0493d428839180f345e29d46d3fa2de474aa -size 806011 +oid sha256:2caf71480d4a0925deab344a9cfedbbff89b386dadef88e1cdd095ee7334a4f0 +size 806612 From b77026e0f8d78d6830226465996cfa82f3ae24c1 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Fri, 7 Feb 2025 17:14:58 -0700 Subject: [PATCH 5/9] Use workflow job plugin 1505.vea_4b_20a_4a_495 --- plugins.txt | 2 +- ref/plugins/workflow-job.jpi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins.txt b/plugins.txt index d2db85647..64ff4f0c8 100644 --- a/plugins.txt +++ b/plugins.txt @@ -166,7 +166,7 @@ workflow-api:1363.v03f731255494 workflow-basic-steps:1079.vce64b_a_929c5a_ workflow-cps:4018.vf02e01888da_f workflow-durable-task-step:1405.v1fcd4a_d00096 -workflow-job:1498.v33a_0c6f3a_4b_4 +workflow-job:1505.vea_4b_20a_4a_495 workflow-multibranch:800.v5f0a_a_660950e workflow-scm-step:427.v4ca_6512e7df1 workflow-step-api:686.v603d058a_e148 diff --git a/ref/plugins/workflow-job.jpi b/ref/plugins/workflow-job.jpi index b39ffeafe..e795e9789 100644 --- a/ref/plugins/workflow-job.jpi +++ b/ref/plugins/workflow-job.jpi @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b8a9dec8d043661a203ad056f1ebfad7c65ae6ae1ebf87419a520decbe6b769 -size 138300 +oid sha256:2c4bb0ae3cc836067f105ca53006b47bf9620a310cfe00de4d6c1ec9d9b46db6 +size 138485 From 9f7c4cb99a7831c102f68d29afa7ac5c1588926a Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 8 Feb 2025 15:30:26 -0700 Subject: [PATCH 6/9] Fix 'vm' implied label - all are VM's except alpine In my configuration, all the agents that run in a container use the Alpine operating system. That is not a general purpose restriction, but happens to work in my configuration at the current time. If more operating system types are added as container agents, then this definition of 'vm' will need to be handled in a different way. For example, if container agents and virtual machine agents can both run Alpine Linux, then some other way is needed to identify a container agent. --- ref/configuration-as-code/unclassified.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ref/configuration-as-code/unclassified.yaml b/ref/configuration-as-code/unclassified.yaml index f5af1d190..3c80bdf27 100644 --- a/ref/configuration-as-code/unclassified.yaml +++ b/ref/configuration-as-code/unclassified.yaml @@ -318,8 +318,9 @@ unclassified: expression: "jdk21&&!windows&&!freebsd&&!alpine" - atoms: "maven-21-windows" expression: "jdk21&&windows" + # All container agents in this config use Alpine OS - atoms: "vm" - expression: "cloud&&linux" + expression: "!alpine" - atoms: "aws" expression: "cloud&&linux&&(amd64||aarch64)" - atoms: "highram" From a8937f00602cd4e2993e61544f09a8ec3bd88d58 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 8 Feb 2025 15:35:20 -0700 Subject: [PATCH 7/9] Fix 'vm' implied label - add 'container' label on non-VM agents Requires that ephemeral agents must have the 'container' label added to their label definition. That allows multiple operating systems for the ephemeral agents and more clearly identifies that an agent is running inside a container. --- ref/configuration-as-code/unclassified.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ref/configuration-as-code/unclassified.yaml b/ref/configuration-as-code/unclassified.yaml index 3c80bdf27..a08bb77d7 100644 --- a/ref/configuration-as-code/unclassified.yaml +++ b/ref/configuration-as-code/unclassified.yaml @@ -320,7 +320,7 @@ unclassified: expression: "jdk21&&windows" # All container agents in this config use Alpine OS - atoms: "vm" - expression: "!alpine" + expression: "!container" - atoms: "aws" expression: "cloud&&linux&&(amd64||aarch64)" - atoms: "highram" From bf1059b6a6d63c294e6236fad63e182dbcb7b099 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 8 Feb 2025 15:37:58 -0700 Subject: [PATCH 8/9] Use pipeline build step plugin 555.v589d5c24a_3d6 --- plugins.txt | 2 +- ref/plugins/pipeline-build-step.jpi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins.txt b/plugins.txt index 64ff4f0c8..16d9f26d3 100644 --- a/plugins.txt +++ b/plugins.txt @@ -114,7 +114,7 @@ okhttp-api:4.11.0-183.va_87fc7a_89810 oss-symbols-api:296.v4981240eeb_1a_ parallel-test-executor:522.vfe4fd4a_3382a_ parameterized-trigger:840.v3c7d4a_a_5e6c7 -pipeline-build-step:551.v178956c49ef8 +pipeline-build-step:555.v589d5c24a_3d6 pipeline-github-lib:61.v629f2cc41d83 pipeline-github:2.8-159.09e4403bc62f pipeline-graph-analysis:216.vfd8b_ece330ca_ diff --git a/ref/plugins/pipeline-build-step.jpi b/ref/plugins/pipeline-build-step.jpi index 27d7933ea..adafafb95 100644 --- a/ref/plugins/pipeline-build-step.jpi +++ b/ref/plugins/pipeline-build-step.jpi @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28b88ba21c4483b073bd85634d67bdbd7ceb6cf47cbc423d3d4635bd66a514e0 -size 53644 +oid sha256:976cd3fb0618e5c87a7b73c43163d49d6d99edac56ba7187498d031ee86b9bfa +size 53680 From 2be4001622ee665f3e34900bf05ebd3e21b8b8c9 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 8 Feb 2025 15:38:01 -0700 Subject: [PATCH 9/9] Use pipeline groovy lib plugin 752.vdddedf804e72 --- plugins.txt | 2 +- ref/plugins/pipeline-groovy-lib.jpi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins.txt b/plugins.txt index 16d9f26d3..1970c443c 100644 --- a/plugins.txt +++ b/plugins.txt @@ -119,7 +119,7 @@ pipeline-github-lib:61.v629f2cc41d83 pipeline-github:2.8-159.09e4403bc62f pipeline-graph-analysis:216.vfd8b_ece330ca_ pipeline-graph-view:409.v98f212e980b_4 -pipeline-groovy-lib:751.v709f84f7d768 +pipeline-groovy-lib:752.vdddedf804e72 pipeline-input-step:508.v584c0e9a_2177 pipeline-maven-api:1469.ve15ca_a_b_90b_44 pipeline-maven:1469.ve15ca_a_b_90b_44 diff --git a/ref/plugins/pipeline-groovy-lib.jpi b/ref/plugins/pipeline-groovy-lib.jpi index 5b1ec5930..d7a00150e 100644 --- a/ref/plugins/pipeline-groovy-lib.jpi +++ b/ref/plugins/pipeline-groovy-lib.jpi @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01291eca7e00aefdab5bb5baaa6a6943d1db15c29f7224cbe02ac3d25e325d0c -size 1409965 +oid sha256:ed150d08dacd67abeebb90a9996eceb8e2610ddb544adfd57148d0729eb997dc +size 1409964