From aadd0451f75dd6ea2da724631314f0ec26296fc2 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 23 May 2022 09:48:40 -0400 Subject: [PATCH 1/2] [JEP-230] [JENKINS-55582] Test `instance-identity` as a detached plugin --- Jenkinsfile | 1 - bom-2.289.x/pom.xml | 62 ---------------------- bom-2.303.x/pom.xml | 52 ------------------- bom-2.319.x/pom.xml | 116 ------------------------------------------ bom-2.332.x/pom.xml | 37 -------------- bom-2.346.x/pom.xml | 22 -------- bom-weekly/pom.xml | 5 ++ pom.xml | 5 -- prep.sh | 1 - sample-plugin/pom.xml | 40 +-------------- 10 files changed, 6 insertions(+), 335 deletions(-) delete mode 100644 bom-2.289.x/pom.xml delete mode 100644 bom-2.303.x/pom.xml delete mode 100644 bom-2.319.x/pom.xml delete mode 100644 bom-2.332.x/pom.xml delete mode 100644 bom-2.346.x/pom.xml diff --git a/Jenkinsfile b/Jenkinsfile index 83f9cf37c..49f1a68f9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,6 @@ stage('prep') { dir('target') { plugins = readFile('plugins.txt').split('\n') lines = readFile('lines.txt').split('\n') - lines = [lines[0], lines[-1]] // run PCT only on newest and oldest lines, to save resources stash name: 'pct', includes: 'pct.jar' lines.each {stash name: "megawar-$it", includes: "megawar-${it}.war"} } diff --git a/bom-2.289.x/pom.xml b/bom-2.289.x/pom.xml deleted file mode 100644 index 47a6f8803..000000000 --- a/bom-2.289.x/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - 4.0.0 - - io.jenkins.tools.bom - parent - ${changelist} - - bom-2.289.x - pom - - - - ${project.groupId} - bom-2.303.x - ${project.version} - pom - import - - - io.jenkins.plugins - dark-theme - 0.0.12 - - - org.jenkins-ci.plugins - config-file-provider - 3.8.1 - - - org.jenkins-ci.plugins - email-ext - 2.87 - - - org.jenkins-ci.plugins - junit - 1.53 - - - org.jenkins-ci.plugins - pipeline-graph-analysis - 1.11 - - - org.jenkins-ci.plugins - saml - 2.0.9 - - - org.jenkins-ci.plugins.workflow - workflow-cps-global-lib - 2.21.3 - - - org.jenkins-ci.plugins.workflow - workflow-durable-task-step - 2.40 - - - - diff --git a/bom-2.303.x/pom.xml b/bom-2.303.x/pom.xml deleted file mode 100644 index dd3c12cf4..000000000 --- a/bom-2.303.x/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - - io.jenkins.tools.bom - parent - ${changelist} - - bom-2.303.x - pom - - - - ${project.groupId} - bom-2.319.x - ${project.version} - pom - import - - - org.jenkins-ci.plugins - bouncycastle-api - 2.25 - - - org.jenkins-ci.plugins - credentials - 2.6.1.1 - - - org.jenkins-ci.plugins - credentials-binding - 1.27.1 - - - org.jenkins-ci.plugins - metrics - 4.0.2.8.1 - - - org.jenkins-ci.plugins - ssh-slaves - 1.806.v2253cedd3295 - - - org.jenkins-ci.plugins - trilead-api - 1.0.13 - - - - diff --git a/bom-2.319.x/pom.xml b/bom-2.319.x/pom.xml deleted file mode 100644 index 889e05c4d..000000000 --- a/bom-2.319.x/pom.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - 4.0.0 - - io.jenkins.tools.bom - parent - ${changelist} - - bom-2.319.x - pom - - - - ${project.groupId} - bom-2.332.x - ${project.version} - pom - import - - - org.jenkins-ci.plugins - display-url-api - 2.3.5 - - - org.jenkins-ci.plugins - junit - 1.54 - - - org.jenkins-ci.plugins - ldap - 2.9 - - - org.jenkins-ci.plugins - metrics - 4.1.6.1 - - - org.jenkins-ci.plugins - script-security - 1138.v8e727069a_025 - - - org.jenkins-ci.plugins - support-core - 2.80 - - - org.jenkins-ci.plugins.workflow - workflow-basic-steps - 2.24 - - - org.jenkins-ci.plugins.workflow - workflow-cps - 2660.vb_c0412dc4e6d - - - org.jenkins-ci.plugins.workflow - workflow-cps - 2660.vb_c0412dc4e6d - tests - - - org.jenkins-ci.plugins.workflow - workflow-job - 1145.v7f2433caa07f - - - org.jenkins-ci.plugins.workflow - workflow-job - 1145.v7f2433caa07f - tests - - - org.jenkins-ci.plugins.workflow - workflow-support - 813.vb_d7c3d2984a_0 - - - org.jenkins-ci.plugins.workflow - workflow-support - 813.vb_d7c3d2984a_0 - tests - - - org.jenkinsci.plugins - pipeline-model-api - 1.9.3 - - - org.jenkinsci.plugins - pipeline-model-definition - 1.9.3 - - - org.jenkinsci.plugins - pipeline-model-definition - 1.9.3 - tests - - - org.jenkinsci.plugins - pipeline-model-extensions - 1.9.3 - - - org.jenkinsci.plugins - pipeline-stage-tags-metadata - 1.9.3 - - - - diff --git a/bom-2.332.x/pom.xml b/bom-2.332.x/pom.xml deleted file mode 100644 index b2bccb4a3..000000000 --- a/bom-2.332.x/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - io.jenkins.tools.bom - parent - ${changelist} - - bom-2.332.x - pom - - - - ${project.groupId} - bom-2.346.x - ${project.version} - pom - import - - - io.jenkins.plugins - dark-theme - 156.v6cf16af6f9ef - - - io.jenkins.plugins - theme-manager - 0.6 - - - org.jenkins-ci.plugins - credentials - 1087.1089.v2f1b_9a_b_040e4 - - - - diff --git a/bom-2.346.x/pom.xml b/bom-2.346.x/pom.xml deleted file mode 100644 index 3a3081f7c..000000000 --- a/bom-2.346.x/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - 4.0.0 - - io.jenkins.tools.bom - parent - ${changelist} - - bom-2.346.x - pom - - - - ${project.groupId} - bom-weekly - ${project.version} - pom - import - - - - diff --git a/bom-weekly/pom.xml b/bom-weekly/pom.xml index 52b646a29..371eedbcb 100644 --- a/bom-weekly/pom.xml +++ b/bom-weekly/pom.xml @@ -174,6 +174,11 @@ lockable-resources 2.15 + + org.jenkins-ci.modules + instance-identity + 3.1 + org.jenkins-ci.modules sshd diff --git a/pom.xml b/pom.xml index 094e578dc..6defcc8f3 100644 --- a/pom.xml +++ b/pom.xml @@ -20,11 +20,6 @@ bom-weekly - bom-2.346.x - bom-2.332.x - bom-2.319.x - bom-2.303.x - bom-2.289.x sample-plugin diff --git a/prep.sh b/prep.sh index 0f12bb3ea..8cbe7bb09 100755 --- a/prep.sh +++ b/prep.sh @@ -11,7 +11,6 @@ $MVN clean install ${SAMPLE_PLUGIN_OPTS:-} ALL_LINEZ=$( echo weekly - grep -F '.x' sample-plugin/pom.xml | sed -E 's, *(.+),\1,g' | sort -rn ) : "${LINEZ:=$ALL_LINEZ}" echo "${LINEZ}" >target/lines.txt diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml index a7ae3b79a..7ca6f79bf 100644 --- a/sample-plugin/pom.xml +++ b/sample-plugin/pom.xml @@ -14,7 +14,7 @@ 999999-SNAPSHOT weekly - 2.348 + 2.349-rc32398.3b_263b_c6b_8a_3 @@ -499,42 +499,4 @@ - - - - 2.346.x - - 2.346.x - 2.346 - - - - 2.332.x - - 2.332.x - 2.332.1 - - - - 2.319.x - - 2.319.x - 2.319.3 - - - - 2.303.x - - 2.303.x - 2.303.3 - - - - 2.289.x - - 2.289.x - 2.289.3 - - - From bd26d541622f613e0a81b3fddf9bbdf2c08f55dd Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 2 Jun 2022 15:23:01 -0400 Subject: [PATCH 2/2] `!failFast` --- failFast | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/failFast b/failFast index 27ba77dda..c508d5366 100644 --- a/failFast +++ b/failFast @@ -1 +1 @@ -true +false