Merge branch 'jenkins-infra:master' into master

.github/renovate.json

@@ -23,12 +23,6 @@
       "depNameTemplate": "node",
       "datasourceTemplate": "npm"
     },
-    {
-      "fileMatch": ["scripts/blobxfer"],
-      "matchStrings": ["CONTAINER_NAME=mcr.microsoft.com/blobxfer:(?<currentValue>.*?)\n"],
-      "depNameTemplate": "mcr.microsoft.com/blobxfer",
-      "datasourceTemplate": "docker"
-    },
     {
       "fileMatch": ["scripts/ruby"],
       "matchStrings": ["CONTAINER_NAME=ruby:(?<currentValue>.*?)\n"],

.github/workflows/label-conflicting-prs.yml

@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   main:
-    if: github.event.pull_request.user.login != 'dependabot[bot]' && github.event.pull_request.user.login != 'jenkins-infra-changelog-generator'
+    if: github.event.pull_request.user.login != 'dependabot[bot]' && github.event.pull_request.user.login != 'jenkins-infra-changelog-generator' && github.repository_owner == 'jenkins-infra'
     runs-on: ubuntu-latest
     steps:
       - name: Label conflicting PRs

.github/workflows/updatecli.yaml

@@ -10,12 +10,13 @@ on:
 jobs:
   updatecli:
     runs-on: ubuntu-latest
+    if: github.repository_owner == 'jenkins-infra'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@v2.43.0
+        uses: updatecli/updatecli-action@v2.55.0
 
       - name: Run Updatecli in Dry Run mode
         run: updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml

.node-version

@@ -1 +1 @@
-20.8.0
+20.11.1

.ruby-version

@@ -1 +1 @@
-3.2.2
+3.3.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.8.0 as node
+FROM node:20.11.1 as node
 ENV USE_LOCAL_NODE=true
 
 WORKDIR /usr/src/jenkinsio/build/_site/
@@ -11,7 +11,7 @@ COPY scripts ./scripts
 RUN npm install
 RUN make assets
 
-FROM ruby:3.2.2 as builder
+FROM ruby:3.3.0 as builder
 ENV USE_LOCAL_RUBY=true
 
 # throw errors if Gemfile has been modified since Gemfile.lock

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'colorize'
-gem 'awestruct', '~> 0.6.6'
+gem 'awestruct', '~> 0.6.7'
 gem 'naturally', '~> 2.2.1'
 gem 'asciidoctor', '~> 2.0.18'
 gem 'asciidoctor-jenkins-extensions', '~> 0.9.0'
@@ -17,7 +17,7 @@ gem 'kramdown', '~> 2.4.0'
 
 # Gems necessary for running scripts/fetch-external-resources
 group :fetcher do
-  gem 'faraday', '~> 2.7.2'
+  gem 'faraday', '~> 2.9.0'
   gem 'faraday-follow_redirects', '~> 0.3.0'
   gem 'rubyzip', '~> 2.3.2'
 end

Gemfile.lock

@@ -4,13 +4,13 @@ GEM
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     ansi (1.5.0)
-    asciidoctor (2.0.20)
+    asciidoctor (2.0.21)
     asciidoctor-jenkins-extensions (0.9.0)
       asciidoctor (>= 1.5.5)
       coderay (~> 1.1.1)
       colorize (~> 0.8.1)
     ast (2.4.2)
-    awestruct (0.6.6)
+    awestruct (0.6.7)
       asciidoctor (>= 1.5.2)
       git (~> 1.2, >= 1.2.6)
       guard (~> 2.0, >= 2.13.0)
@@ -24,23 +24,21 @@ GEM
       rack (~> 2.0)
       rest-client (~> 2.0)
       tilt (~> 2.0, >= 2.0.1)
-    base64 (0.1.1)
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    faraday (2.7.11)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.0.2)
+    faraday-net_http (3.1.0)
+      net-http
     ffi (1.13.1)
     formatador (1.1.0)
     git (1.18.0)
@@ -86,6 +84,8 @@ GEM
     multi_json (1.15.0)
     naturally (2.2.1)
     nenv (0.3.0)
+    net-http (0.4.1)
+      uri
     netrc (0.11.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -109,13 +109,12 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     rexml (3.2.6)
-    rouge (4.1.3)
+    rouge (4.2.0)
     rss (0.3.0)
       rexml
     ruby-ll (2.1.2)
       ansi
       ast
-    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     sassc (2.4.0)
       ffi (~> 1.9)
@@ -126,6 +125,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
+    uri (0.13.0)
     webrick (1.8.1)
 
 PLATFORMS
@@ -134,10 +134,10 @@ PLATFORMS
 DEPENDENCIES
   asciidoctor (~> 2.0.18)
   asciidoctor-jenkins-extensions (~> 0.9.0)
-  awestruct (~> 0.6.6)
+  awestruct (~> 0.6.7)
   colorize
   concurrent-ruby (~> 1.1)
-  faraday (~> 2.7.2)
+  faraday (~> 2.9.0)
   faraday-follow_redirects (~> 0.3.0)
   haml (~> 5.2.0)
   kramdown (~> 2.4.0)

Jenkinsfile

@@ -28,7 +28,6 @@ node('docker&&linux') {
         sh 'ls -lah'
     }
 
-
     stage('Checkout source') {
         /*
         * For a standalone workflow script, we would use the `git` step
@@ -86,13 +85,38 @@ node('docker&&linux') {
     /* The Jenkins which deploys doesn't use multibranch or GitHub Org Folders.
     */
     if (infra.isTrusted() && env.BRANCH_NAME == null) {
-        stage('Publish on Azure') {
-            /* -> https://github.com/Azure/blobxfer
-            Require credential 'BLOBXFER_STORAGEACCOUNTKEY' set to the storage account key */
-            withCredentials([string(credentialsId: 'BLOBXFER_STORAGEACCOUNTKEY', variable: 'BLOBXFER_STORAGEACCOUNTKEY')]) {
-                sh './scripts/blobxfer upload --local-path /data/_site --storage-account-key $BLOBXFER_STORAGEACCOUNTKEY --storage-account prodjenkinsio --remote-path jenkinsio --recursive --mode file --skip-on-md5-match --file-md5'
+        stage('Publish site') {
+            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}"
+
+                # Retrieve azcopy logs to archive them
+                cat /home/jenkins/.azcopy/*.log > azcopy.log
+                '''
+                archiveArtifacts 'azcopy.log'
             }
         }
+        stage('Purge cached CSS') {
+            sh '''
+            curl --request PURGE https://www.jenkins.io/css/jenkins.css
+            curl --request PURGE https://www.jenkins.io/stylesheets/styles.css
+            '''
+        }
     }
 }
 

Jenkinsfile_k8s

@@ -1,41 +1,7 @@
 
 pipeline {
   agent {
-    kubernetes {
-      yaml '''
-apiVersion: "v1"
-kind: "Pod"
-metadata:
-  labels:
-    jenkins: "agent"
-    job: "jenkins-io"
-spec:
-  tolerations:
-    - key: "os"
-      operator: "Equal"
-      value: "linux"
-      effect: "NoSchedule"
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-          - matchExpressions:
-              - key: kubernetes.io/os
-                operator: In
-                values:
-                  - linux
-  restartPolicy: "Never"
-  automountServiceAccountToken: false
-  containers:
-    - name: "jnlp"
-      image: "jenkinsciinfra/builder:3.0.14"
-      resources:
-        limits: {}
-        requests:
-          memory: "4Gi"
-          cpu: "2"
-      '''
-    }
+    label 'linux-arm64-docker'
   }
 
   environment {

Makefile

@@ -15,7 +15,7 @@ prepare: scripts-permission fetch depends assets
 
 ## Runs a live-reloading development server on 127.0.0.1 at port 4242.
 run: prepare scripts/awestruct
-	LISTEN=true ./scripts/awestruct --dev --bind 0.0.0.0  $(AWESTRUCT_CONFIG)
+	LISTEN=true ./scripts/awestruct --dev --bind 0.0.0.0 $(AWESTRUCT_CONFIG)
 
 ## Explicitly generate static website files.
 generate: prepare scripts/awestruct real_generate

STYLEGUIDE.adoc

@@ -115,7 +115,7 @@ node {
 
 // Declarative //
 pipeline {
-    agent { docker { image 'node:18.18.0-alpine3.18' } }
+    agent { docker { image 'node:20.11.1-alpine3.19' } }
     stages {
 	stage('Build') {
 	    sh 'npm install'

content/404.html.haml

@@ -2,20 +2,72 @@
 layout: default
 title: Not Found
 notitle: true
+hideSearchBar: true
 ---
 
 :css
   .errorcontainer {
     text-align: center;
-    margin: 30px;
+  }
+
+  .errorcontainer img {
+    max-width: 12%;
+    height: auto;
+  }
+
+  .searchcontainer {
+    text-align: center;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin:10px;
+  }
+
+  .searchcontainer .DocSearch-Button{
+    width: 25%;
+    margin-bottom: 30px;
   }
 
 %div.errorcontainer
   %img{:src => '/images/fire-jenkins.svg'}
 
-  %h1
+  %h3
     The page you requested could not be found.
 
   %p
   %a{:href => "/"} Back to homepage
 
+%div.searchcontainer
+  %h3
+    Search for related pages
+
+:javascript
+  // fetch last segment from URL
+  const path = window.location.pathname;
+  const pathSegments = path.split('/').filter(Boolean);
+  const lastSegmentIndex = pathSegments.length - 1;
+  const lastSegment = pathSegments[lastSegmentIndex];
+
+  const div = document.createElement('div');
+  div.classList.add('searchcontainer');
+
+  const scriptFileEl = document.createElement('script');
+  scriptFileEl.setAttribute('defer', '');
+  scriptFileEl.setAttribute('src', `https://cdn.jsdelivr.net/npm/@docsearch/js@3`);
+  document.head.appendChild(scriptFileEl);
+
+  scriptFileEl.addEventListener('load', () => {
+    // enable docsearch
+    window.docsearch({
+      // point it at the renderroot
+      container: div,
+      indexName: 'jenkins',
+      appId: "M6L7Q4Z8HS",
+      apiKey: "52f8dfbff76ffd9106f1c68fee16154b",
+      searchParameters: {
+      },
+      initialQuery: lastSegment,
+    });
+  });
+
+  document.body.append(div);

content/_data/authors/Yaniv-git.adoc

@@ -0,0 +1,5 @@
+---
+name: "Yaniv Nizry"
+twitter: YNizry
+github: Yaniv-git
+---

content/_data/authors/harsh-ps-2003.adoc

@@ -4,8 +4,8 @@ github: harsh-ps-2003
 twitter: harsh_ps2003
 linkedin: harsh-pratap-singh-787485255
 ---
-Harsh is currently a Freshman at the Indian Institute of Technology, Kanpur, whose interests lies in rapidly evolving Computer Science fields like DevSecOps, Blockchain and more. He is an avid open-source contributor and is inspired by the idea of developing useful open-source software for the masses to use. 
+Harsh is currently an undergrad at the Indian Institute of Technology, Kanpur, whose interests lies in rapidly evolving Computer Science fields like Linux Performance, DevOps, GenAI and more. He is an avid open-source contributor and is inspired by the idea of developing useful open-source software for the masses to use. 
 Other than software development, his interest lies in economics, philosophy, and psychology.
-He is a Jenkins Google Summer of Code (GSoC) contributor in 2023, participating in the link:https://github.com/jenkinsci/gitlab-plugin[GitLab Plugin Modernization] project.
-He started his journey of contributing to Jenkins in February 2023 and got hooked since.
+He was a Jenkins Google Summer of Code (GSoC) contributor in 2023, participating in the link:https://github.com/jenkinsci/gitlab-plugin[GitLab Plugin Modernization] project.
+He started his journey of contributing to Jenkins in February 2023 and got hooked since. He is also a maintainer of link:https://plugins.jenkins.io/gitlab-plugin/[GitLab Plugin].
 

content/_data/authors/jonesbusy.adoc

@@ -0,0 +1,8 @@
+---
+name: "Valentin Delaye"
+github: jonesbusy
+linkedin: valentindelaye
+---
+
+// descriptive text comes here
+Valentin is an open source enthusiast and a DevOps engineer from Switzerland. He's passionate about automation and infrastructure as code. He's currently maintainer of around 30 Jenkins plugins in different areas (APIs, cloud-native, pluggable storage, etc.). 

content/_data/authors/laulopezreal.adoc

@@ -0,0 +1,7 @@
+---
+name: "Laura Lopez Real"
+github: "laulopezreal"
+---
+Laura is a Data Engineer at AstraZeneca, working on Knowledge Graphs.
+She spends a lot of time thinking about how to build efficient pipelines and how to orchestrate such pipelines.
+She is keen to bring her expertise working with LLMs into the proposals for the 2024 GSoC.