Merge branch 'jenkins-infra:master' into master

.github/workflows/compress-images.yaml

@@ -0,0 +1,22 @@
+name: Compress Images
+on:
+  pull_request_target:
+    paths:
+      - '**.jpg'
+      - '**.jpeg'
+      - '**.png'
+      - '**.webp'
+jobs:
+  build:
+    name: calibreapp/image-actions
+    permissions: write-all
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+
+      - name: Compress Images
+        uses: calibreapp/image-actions@main
+        with:
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          ignorePaths: 'content/images/avatars/**'

.github/workflows/updatecli.yaml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@v2.67.0
+        uses: updatecli/updatecli-action@v2.70.0
 
       - name: Run Updatecli in Dry Run mode
         run: updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml

.ruby-version

@@ -1 +1 @@
-3.3.4
+3.3.5

.typos.toml

@@ -60,6 +60,7 @@ check-filename = false
 "loLSNdCv6K4" = "loLSNdCv6K4"
 "ArachnePnR" = "ArachnePnR"
 "LIy90gGvmIU" = "LIy90gGvmIU"
+"71Nd_6OqdQk" = "71Nd_6OqdQk"
 "PNGs" = "PNGs"
 "Lso" = "Lso"
 "ND" = "ND"

Dockerfile

@@ -11,7 +11,7 @@ COPY scripts ./scripts
 RUN npm install
 RUN make assets
 
-FROM ruby:3.3.4 as builder
+FROM ruby:3.3.5 as builder
 ENV USE_LOCAL_RUBY=true
 
 # throw errors if Gemfile has been modified since Gemfile.lock

Gemfile.lock

@@ -26,7 +26,7 @@ GEM
       tilt (~> 2.0, >= 2.0.1)
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     em-websocket (0.5.3)
@@ -108,10 +108,9 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.9)
     rouge (4.2.1)
-    rss (0.3.0)
+    rss (0.3.1)
       rexml
     ruby-ll (2.1.2)
       ansi
@@ -120,15 +119,14 @@ GEM
     sassc (2.4.0)
       ffi (~> 1.9)
     shellany (0.0.1)
-    strscan (3.1.0)
     temple (0.10.0)
     thor (1.2.1)
     tilt (2.0.11)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
     uri (0.13.0)
-    webrick (1.8.1)
+    webrick (1.8.2)
 
 PLATFORMS
   ruby

Jenkinsfile

@@ -86,25 +86,31 @@ node('docker&&linux') {
     */
     if (infra.isTrusted() && env.BRANCH_NAME == null) {
         stage('Publish site') {
-            infra.withFileShareServicePrincipal([
-                servicePrincipalCredentialsId: 'trustedci_jenkinsio_fileshare_serviceprincipal_writer',
-                fileShare: 'jenkins-io',
-                fileShareStorageAccount: 'jenkinsio'
-            ]) {
+            try {
+                infra.withFileShareServicePrincipal([
+                    servicePrincipalCredentialsId: 'trustedci_jenkinsio_fileshare_serviceprincipal_writer',
+                    fileShare: 'jenkins-io',
+                    fileShareStorageAccount: 'jenkinsio'
+                ]) {
+                    sh '''
+                    # Don't output sensitive information
+                    set +x
+    
+                    # Synchronize the File Share content
+                    azcopy sync \
+                        --skip-version-check \
+                        --recursive=true\
+                        --delete-destination=true \
+                        --compare-hash=MD5 \
+                        --put-md5 \
+                        --local-hash-storage-mode=HiddenFiles \
+                        ./build/_site/ "${FILESHARE_SIGNED_URL}"
+                    '''
+                }
+            } catch (err) {
+                currentBuild.result = 'FAILURE'
+                // Only collect azcopy log when the deployment fails, because it is an heavy one
                 sh '''
-                # Don't output sensitive information
-                set +x
-
-                # Synchronize the File Share content
-                azcopy sync \
-                    --skip-version-check \
-                    --recursive=true\
-                    --delete-destination=true \
-                    --compare-hash=MD5 \
-                    --put-md5 \
-                    --local-hash-storage-mode=HiddenFiles \
-                    ./build/_site/ "${FILESHARE_SIGNED_URL}"
-
                 # Retrieve azcopy logs to archive them
                 cat /home/jenkins/.azcopy/*.log > azcopy.log
                 '''

STYLEGUIDE.adoc

@@ -115,7 +115,7 @@ node {
 
 // Declarative //
 pipeline {
-    agent { docker { image 'node:20.17.0-alpine3.20' } }
+    agent { docker { image 'node:22.11.0-alpine3.20' } }
     stages {
 	stage('Build') {
 	    sh 'npm install'

content/_data/authors/oleg_nenashev.adoc

@@ -7,9 +7,17 @@ linkedin: onenashev
 irc: oleg_nenashev
 ---
 
-Jenkins core maintainer and board member, open source software and open hardware advocate, TOC member in the Continuous Delivery Foundation.
+Jenkins core maintainer and a former board member (Dec 2019 - Dec 2023). 
+Oleg is a community builder, open source and open hardware advocate, and DevRel consultant.
+He is a CNCF/CDF Ambassador, Testcontainers Champion, and a former CDF TOC chair.
+Oleg works as a Lead Developer Advocate for Gradle Build Tool,
+and also does commercial and pro-bono link:https://oleg-nenashev.github.io/oleg-nenashev/consulting/[consulting], including Jenkins and CI/CD topics.
+
 Oleg started using Hudson for Hardware/Embedded projects in 2008 and became an active Jenkins contributor in 2012.
+In 2014, he became a core maintainer.
+Oleg maintained more than 30 plugins and participated in many projects including JCasC, pluggable storage, and Jenkinsfile Runner.
 He maintains https://github.com/jenkinsci/jenkinsfile-runner/[Jenkinsfile Runner],
 contributes to several Jenkins link:/sigs[SIGs] and outreach programs (link:/projects/gsoc[Google Summer of Code], link:/events/hacktoberfest[Hacktoberfest])
 and organizes link:/projects/jam/[Jenkins meetups] in Switzerland and online.
-Oleg works on the https://wiremock.org/[WireMock project] and WireMock Cloud community at https://wiremock.io/[WireMock Inc].
+
+In 2022 Oleg took a sabbatical as a core and plugin maintainer due to the war in Ukraine and, hence, changes in the volunteering priorities.

content/_data/authors/stefan_spieker.adoc

@@ -0,0 +1,11 @@
+---
+name: "Stefan Spieker"
+github: StefanSpieker
+linkedin: stefan-spieker-446168161
+---
+
+I started contributing regularly in 2019, with a focus on improving quality.
+I'm also keeping up with some older plugins that are still really popular, like the Thin Backup Plugin and the Job Configuration History Plugin.
+The community helped me to bring these back up to standard and I learned a lot along the way. Furthermore, I use these lessons to make regular improvements to the developer documentation.
+
+In my day job, I'm a solution architect in a central team that provides Jenkins and DevOps consulting within a big automotive and industrial company.