From c69dc3e294cad131b5782dc58642ad6fadd9a36f Mon Sep 17 00:00:00 2001 From: Tobias Richter Date: Thu, 27 Jan 2022 15:32:38 +0100 Subject: [PATCH 1/9] Update tags --- meta/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/main.yml b/meta/main.yml index d16ca5f..9cd7124 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -63,3 +63,4 @@ dependencies: jenkins_script_security_approved_signatures_present: "{{ jenkins_pipeline_library_approved_signatures_present }}" tags: - 'wcm_io_devops.jenkins_pipeline_library.jenkins_script_security' + - "wcm_io_devops.jenkins_script_security" \ No newline at end of file From f3068eee663b67329ce1e852a67bba9ba6530d12 Mon Sep 17 00:00:00 2001 From: Tobias Richter Date: Thu, 27 Jan 2022 15:33:02 +0100 Subject: [PATCH 2/9] Update Jenkins to 2.319.2 --- defaults/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yaml b/defaults/main.yaml index 4642d30..72532a2 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -1,6 +1,6 @@ --- # The version of the jenkins when it is installed with the jenkins role dependency -jenkins_pipeline_library_jenkins_version: 2.289.1 +jenkins_pipeline_library_jenkins_version: "2.319.2" # Controls if the jenkins will be installed by the jenkins role dependency jenkins_pipeline_library_jenkins_install: false From 134560a716e94e29d6f0a3183bc4286bc2ca4ab2 Mon Sep 17 00:00:00 2001 From: Tobias Richter Date: Thu, 27 Jan 2022 15:33:49 +0100 Subject: [PATCH 3/9] Update/Add plugins, remove deprecated plugins --- defaults/main.yaml | 131 ++++++++++++++++++++++++--------------------- 1 file changed, 71 insertions(+), 60 deletions(-) diff --git a/defaults/main.yaml b/defaults/main.yaml index 72532a2..7719c67 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -56,162 +56,173 @@ jenkins_pipeline_library_plugins_present: - name: apache-httpcomponents-client-4-api version: "4.5.13-1.0" - name: bootstrap4-api - version: "4.6.0-3" + version: "4.6.0-3"# + - name: bootstrap5-api + version: "5.1.3-4" - name: bouncycastle-api - version: "2.20" + version: "2.25" - name: branch-api - version: "2.6.4" + version: "2.7.0" - name: caffeine-api - version: "2.9.1-23.v51c4e2c879c8" + version: "2.9.2-29.v717aac953ff3" - name: checks-api - version: "1.7.0" + version: "1.7.2" - name: cloudbees-folder - version: "6.15" + version: "6.17" - name: command-launcher version: "1.6" - name: config-file-provider - version: "3.8.0" + version: "3.8.2" - name: configuration-as-code - version: "1.51" + version: "1.55.1" - name: credentials - version: "2.5" + version: "1074.v60e6c29b_b_44b_" - name: credentials-binding - version: "1.25" + version: "1.27.1" - name: display-url-api version: "2.3.5" - name: docker-workflow - version: "1.26" + version: "1.27" - name: docker-commons - version: "1.17" + version: "1.18" - name: durable-task - version: "1.37" + version: "493.v195aefbb0ff2" - name: echarts-api - version: "5.1.0-2" + version: "5.2.2-2" - name: extended-choice-parameter version: "0.82" - name: email-ext - version: "2.83" + version: "2.87" - name: font-awesome-api - version: "5.15.3-2" + version: "5.15.4-5" - name: git - version: "4.7.2" + version: "4.10.3" - name: git-client - version: "3.7.2" + version: "3.11.0" - name: git-server - version: "1.9" + version: "1.10" - name: handlebars version: "3.0.8" - name: http_request - version: "1.9.0" + version: "1.13" - name: jackson2-api - version: "2.12.3" + version: "2.13.1-246.va8a9f3eaf46a" + - name: javax-activation-api + version: "1.2.0-2" + - name: javax-mail-api + version: "1.6.2-5" - name: jdk-tool version: "1.5" - name: junit - version: "1.50" + version: "1.53" - name: jquery version: "1.12.4-1" - name: jquery-detached version: "1.2.1" - name: jquery3-api - version: "3.6.0-1" + version: "3.6.0-2" - name: jsch version: "0.1.55.2" - name: managed-scripts version: "1.5.4" - name: mailer - version: "1.34" + version: "408.vd726a_1130320" - name: managed-scripts version: "1.5.4" - name: mattermost version: "3.1.1" - name: matrix-project - version: "1.19" + version: "1.20" + - name: maven-plugin + version: "3.16" - name: momentjs version: "1.1.1" - name: mqtt-notification-plugin version: "1.8" - name: nodejs - version: "1.4.0" + version: "1.5.1" - name: Office-365-Connector - version: "4.15.0" + version: "4.15.2" - name: pipeline-aggregator-view version: "1.11" - name: pipeline-build-step - version: "2.13" + version: "2.15" - name: pipeline-graph-analysis - version: "1.11" + version: "188.v3a01e7973f2c" - name: pipeline-input-step - version: "2.12" + version: "446.vf27b_0b_83500e" - name: pipeline-milestone-step version: "1.3.2" - - name: pipeline-model-declarative-agent - version: "1.1.1" - name: pipeline-model-definition - version: "1.8.5" + version: "1.9.3" - name: pipeline-model-api - version: "1.8.5" + version: "1.9.3" - name: pipeline-model-extensions - version: "1.8.5" + version: "1.9.3" - name: pipeline-rest-api - version: "2.19" + version: "2.21" - name: pipeline-stage-step - version: "2.5" + version: "291.vf0a8a7aeeb50" - name: pipeline-stage-tags-metadata - version: "1.8.5" + version: "1.9.3" - name: pipeline-stage-view - version: "2.19" + version: "2.21" - name: pipeline-utility-steps - version: "2.8.0" + version: "2.12.0" - name: plain-credentials - version: "1.7" + version: "1.8" - name: plugin-util-api - version: "2.2.0" + version: "2.13.0" - name: popper-api version: "1.16.1-2" + - name: popper2-api + version: 2.11.2-1 - name: rebuild - version: "1.32" + version: "1.33" - name: scm-api - version: "2.6.4" + version: "595.vd5a_df5eb_0e39" - name: script-security - version: "1.77" + version: "1131.v8b_b_5eda_c328e" - name: ssh-credentials version: "1.19" - name: ssh-steps version: "2.0.0" - name: ssh-slaves - version: "1.32.0" + version: "1.33.0" + - name: sshd + version: "3.1.0" - name: snakeyaml-api - version: "1.27.0" + version: "1.29.1" - name: structs - version: "1.23" + version: "308.v852b473a2b8c" - name: token-macro - version: "2.15" + version: "267.vcdaea6462991" - name: trilead-api version: "1.0.13" - name: workflow-api - version: "2.44" + version: "1136.v7f5f1759dc16" - name: workflow-basic-steps - version: "2.23" + version: "2.24" - name: workflow-cps - version: "2.92" + version: "2648.va9433432b33c" - name: workflow-cps-global-lib - version: "2.19" + version: "552.vd9cc05b8a2e1" - name: workflow-durable-task-step - version: "2.39" + version: "1121.va_65b_d2701486" - name: workflow-job - version: "2.41" + version: "1145.v7f2433caa07f" - name: workflow-multibranch - version: "2.24" + version: "706.vd43c65dec013" - name: workflow-scm-step - version: "2.12" + version: "2.13" - name: workflow-step-api - version: "2.23" + version: "622.vb_8e7c15b_c95a_" - name: workflow-support - version: "3.8" + version: "813.vb_d7c3d2984a_0" # Plugins that must be absent for jenkins-pipeline-library -jenkins_pipeline_library_plugins_absent: [] +jenkins_pipeline_library_plugins_absent: + - name: pipeline-model-declarative-agent # Signatures that need to be approved for jenkins-pipeline-library jenkins_pipeline_library_approved_signatures_present: From 81bda9c0b8c0b26ddba4989ff322b0cb9a05846a Mon Sep 17 00:00:00 2001 From: Tobias Date: Mon, 28 Feb 2022 21:47:31 +0100 Subject: [PATCH 4/9] Move warnings-ng plugin from pro-vision/jenkins-pv-pipeline-library to wcm-io-devops/jenkins-pipeline-library --- defaults/main.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/defaults/main.yaml b/defaults/main.yaml index 7719c67..eb7a0fc 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -49,10 +49,14 @@ jenkins_pipeline_library_debug: false # Plugins and their versions that must be present for jenkins-pipeline-library jenkins_pipeline_library_plugins_present: + - name: analysis-model-api + version: "10.9.1" - name: ace-editor version: "1.1" - name: authentication-tokens version: "1.4" + - name: antisamy-markup-formatter + version: "2.7" - name: apache-httpcomponents-client-4-api version: "4.5.13-1.0" - name: bootstrap4-api @@ -79,6 +83,8 @@ jenkins_pipeline_library_plugins_present: version: "1074.v60e6c29b_b_44b_" - name: credentials-binding version: "1.27.1" + - name: data-tables-api + version: "1.11.3-6" - name: display-url-api version: "2.3.5" - name: docker-workflow @@ -95,6 +101,8 @@ jenkins_pipeline_library_plugins_present: version: "2.87" - name: font-awesome-api version: "5.15.4-5" + - name: forensics-api + version: "1.7.0" - name: git version: "4.10.3" - name: git-client @@ -107,6 +115,8 @@ jenkins_pipeline_library_plugins_present: version: "1.13" - name: jackson2-api version: "2.13.1-246.va8a9f3eaf46a" + - name: javadoc + version: "1.6" - name: javax-activation-api version: "1.2.0-2" - name: javax-mail-api @@ -177,6 +187,8 @@ jenkins_pipeline_library_plugins_present: version: "1.16.1-2" - name: popper2-api version: 2.11.2-1 + - name: prism-api + version: 1.25.0-2 - name: rebuild version: "1.33" - name: scm-api @@ -199,6 +211,8 @@ jenkins_pipeline_library_plugins_present: version: "267.vcdaea6462991" - name: trilead-api version: "1.0.13" + - name: warnings-ng + version: "9.11.0" - name: workflow-api version: "1136.v7f5f1759dc16" - name: workflow-basic-steps From 58f38018bfecf58c36382e29f833b8309aefb4f3 Mon Sep 17 00:00:00 2001 From: Tobias Richter Date: Tue, 1 Mar 2022 08:29:31 +0100 Subject: [PATCH 5/9] Use python 3.9.x --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d04469..129a5d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: - name: Set up Python 3. uses: actions/setup-python@v2 with: - python-version: '3.x' + python-version: '3.9.x' - name: Install pip tools. run: | From be3b1130b951bb44c59df0a1b5d233d180234551 Mon Sep 17 00:00:00 2001 From: Tobias Richter Date: Tue, 1 Mar 2022 09:55:44 +0100 Subject: [PATCH 6/9] Fix typo --- defaults/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yaml b/defaults/main.yaml index eb7a0fc..c0d990e 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -60,7 +60,7 @@ jenkins_pipeline_library_plugins_present: - name: apache-httpcomponents-client-4-api version: "4.5.13-1.0" - name: bootstrap4-api - version: "4.6.0-3"# + version: "4.6.0-3" - name: bootstrap5-api version: "5.1.3-4" - name: bouncycastle-api From f354f506d0eb5f37d3c09645d849f67eb2917c57 Mon Sep 17 00:00:00 2001 From: Tobias Richter Date: Tue, 1 Mar 2022 09:58:02 +0100 Subject: [PATCH 7/9] Fix alphabetical order --- defaults/main.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/defaults/main.yaml b/defaults/main.yaml index c0d990e..4438801 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -1,6 +1,6 @@ --- # The version of the jenkins when it is installed with the jenkins role dependency -jenkins_pipeline_library_jenkins_version: "2.319.2" +jenkins_pipeline_library_jenkins_version: "2.319.3" # Controls if the jenkins will be installed by the jenkins role dependency jenkins_pipeline_library_jenkins_install: false @@ -49,16 +49,16 @@ jenkins_pipeline_library_debug: false # Plugins and their versions that must be present for jenkins-pipeline-library jenkins_pipeline_library_plugins_present: - - name: analysis-model-api - version: "10.9.1" - name: ace-editor version: "1.1" - - name: authentication-tokens - version: "1.4" + - name: analysis-model-api + version: "10.9.1" - name: antisamy-markup-formatter version: "2.7" - name: apache-httpcomponents-client-4-api version: "4.5.13-1.0" + - name: authentication-tokens + version: "1.4" - name: bootstrap4-api version: "4.6.0-3" - name: bootstrap5-api From 180ef5780f252bf6d27f52d2535f0e994f1da7fc Mon Sep 17 00:00:00 2001 From: Tobias Richter Date: Tue, 1 Mar 2022 09:58:39 +0100 Subject: [PATCH 8/9] Fix missing new line character --- meta/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index 9cd7124..61ae7ec 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -63,4 +63,4 @@ dependencies: jenkins_script_security_approved_signatures_present: "{{ jenkins_pipeline_library_approved_signatures_present }}" tags: - 'wcm_io_devops.jenkins_pipeline_library.jenkins_script_security' - - "wcm_io_devops.jenkins_script_security" \ No newline at end of file + - "wcm_io_devops.jenkins_script_security" From c19c9cc02cc3c2d978fb076c0d2691987db7e389 Mon Sep 17 00:00:00 2001 From: Tobias Richter Date: Tue, 1 Mar 2022 14:54:31 +0100 Subject: [PATCH 9/9] Update plugin version(s) --- defaults/main.yaml | 56 +++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/defaults/main.yaml b/defaults/main.yaml index 4438801..efad06e 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -52,7 +52,7 @@ jenkins_pipeline_library_plugins_present: - name: ace-editor version: "1.1" - name: analysis-model-api - version: "10.9.1" + version: "10.9.2" - name: antisamy-markup-formatter version: "2.7" - name: apache-httpcomponents-client-4-api @@ -62,7 +62,7 @@ jenkins_pipeline_library_plugins_present: - name: bootstrap4-api version: "4.6.0-3" - name: bootstrap5-api - version: "5.1.3-4" + version: "5.1.3-6" - name: bouncycastle-api version: "2.25" - name: branch-api @@ -72,37 +72,37 @@ jenkins_pipeline_library_plugins_present: - name: checks-api version: "1.7.2" - name: cloudbees-folder - version: "6.17" + version: "6.708.ve61636eb_65a_5" - name: command-launcher version: "1.6" - name: config-file-provider - version: "3.8.2" + version: "3.9.0" - name: configuration-as-code - version: "1.55.1" + version: "1414.v878271fc496f" - name: credentials version: "1074.v60e6c29b_b_44b_" - name: credentials-binding version: "1.27.1" - name: data-tables-api - version: "1.11.3-6" + version: "1.11.4-1" - name: display-url-api version: "2.3.5" - name: docker-workflow - version: "1.27" + version: "1.28" - name: docker-commons - version: "1.18" + version: "1.19" - name: durable-task version: "493.v195aefbb0ff2" - name: echarts-api - version: "5.2.2-2" + version: "5.3.0-2" - name: extended-choice-parameter - version: "0.82" + version: "346.vd87693c5a_86c" - name: email-ext version: "2.87" - name: font-awesome-api - version: "5.15.4-5" + version: "6.0.0-1" - name: forensics-api - version: "1.7.0" + version: "1.8.1" - name: git version: "4.10.3" - name: git-client @@ -112,11 +112,11 @@ jenkins_pipeline_library_plugins_present: - name: handlebars version: "3.0.8" - name: http_request - version: "1.13" + version: "1.14" - name: jackson2-api version: "2.13.1-246.va8a9f3eaf46a" - name: javadoc - version: "1.6" + version: "217.v905b_86277a_2a_" - name: javax-activation-api version: "1.2.0-2" - name: javax-mail-api @@ -124,7 +124,7 @@ jenkins_pipeline_library_plugins_present: - name: jdk-tool version: "1.5" - name: junit - version: "1.53" + version: "1.54" - name: jquery version: "1.12.4-1" - name: jquery-detached @@ -156,13 +156,13 @@ jenkins_pipeline_library_plugins_present: - name: pipeline-aggregator-view version: "1.11" - name: pipeline-build-step - version: "2.15" + version: "2.16" - name: pipeline-graph-analysis version: "188.v3a01e7973f2c" - name: pipeline-input-step version: "446.vf27b_0b_83500e" - name: pipeline-milestone-step - version: "1.3.2" + version: "100.v60a_03cd446e1" - name: pipeline-model-definition version: "1.9.3" - name: pipeline-model-api @@ -170,31 +170,31 @@ jenkins_pipeline_library_plugins_present: - name: pipeline-model-extensions version: "1.9.3" - name: pipeline-rest-api - version: "2.21" + version: "2.22" - name: pipeline-stage-step version: "291.vf0a8a7aeeb50" - name: pipeline-stage-tags-metadata version: "1.9.3" - name: pipeline-stage-view - version: "2.21" + version: "2.22" - name: pipeline-utility-steps version: "2.12.0" - name: plain-credentials version: "1.8" - name: plugin-util-api - version: "2.13.0" + version: "2.14.0" - name: popper-api version: "1.16.1-2" - name: popper2-api version: 2.11.2-1 - name: prism-api - version: 1.25.0-2 + version: "1.26.0-2" - name: rebuild version: "1.33" - name: scm-api version: "595.vd5a_df5eb_0e39" - name: script-security - version: "1131.v8b_b_5eda_c328e" + version: "1138.v8e727069a_025" - name: ssh-credentials version: "1.19" - name: ssh-steps @@ -208,25 +208,25 @@ jenkins_pipeline_library_plugins_present: - name: structs version: "308.v852b473a2b8c" - name: token-macro - version: "267.vcdaea6462991" + version: "280.v97a_82642793c" - name: trilead-api version: "1.0.13" - name: warnings-ng - version: "9.11.0" + version: "9.11.1" - name: workflow-api - version: "1136.v7f5f1759dc16" + version: "1138.v619fd5201b_2f" - name: workflow-basic-steps version: "2.24" - name: workflow-cps - version: "2648.va9433432b33c" + version: "2659.v52d3de6044d0" - name: workflow-cps-global-lib - version: "552.vd9cc05b8a2e1" + version: "564.ve62a_4eb_b_e039" - name: workflow-durable-task-step version: "1121.va_65b_d2701486" - name: workflow-job version: "1145.v7f2433caa07f" - name: workflow-multibranch - version: "706.vd43c65dec013" + version: "711.vdfef37cda_816" - name: workflow-scm-step version: "2.13" - name: workflow-step-api