Merge remote-tracking branch 'upstream/main'

Author: gounthar

.github/workflows/github-docker-registry-push.yml

@@ -204,3 +204,13 @@ jobs:
           platforms: linux/amd64, linux/arm64
           push: true
           tags: ghcr.io/${{ env.REPO_NAME }}/jenkinsci-tutorials:golang_${{ env.BRANCH }}
+
+      - name: Build and push the jenkins agent for cpp tutorial
+        # This step builds and pushes the Jenkins agent for the C++ tutorial
+        if: contains(env.files, 'dockerfiles/cpp/Dockerfile')
+        uses: docker/build-push-action@v6
+        with:
+          context: ./dockerfiles/cpp
+          platforms: linux/amd64, linux/aarch64
+          push: true
+          tags: ghcr.io/${{ env.REPO_NAME }}/jenkinsci-tutorials:cpp_agent_${{ env.BRANCH }}

.gitpod/Dockerfile

@@ -1,7 +1,7 @@
 # This Dockerfile is used to create a Gitpod workspace with GitHub CLI installed.
 
 # We start from the Gitpod full workspace image which includes a broad range of development tools.
-FROM gitpod/workspace-full:2025-02-12-08-12-04
+FROM gitpod/workspace-full:2025-02-17-19-56-13
 
 # The RUN command executes a series of commands in the new layer of the image and commits the results.
 # The following commands are executed:

build-docker-compose.yaml

@@ -205,6 +205,23 @@ services:
       retries: 5
     volumes:
       - agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
+  cpp:
+    build: dockerfiles/cpp/.
+    container_name: desktop-jenkins_agent-1-cpp
+    profiles:
+      - cpp
+    depends_on:
+      sidekick_service:
+        condition: service_completed_successfully
+      jenkins_controller:
+        condition: service_started
+    healthcheck:
+      test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
+      interval: 5s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - agent-ssh-dir:/home/jenkins/.ssh:ro
 volumes:
   jenkins_home: null
   agent-ssh-dir:

docker-compose.yaml

@@ -281,6 +281,23 @@ services:
       retries: 5
     volumes:
       - agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
+  cpp:
+    image: ${IMAGE_PREFIX}/${GHCR_USERNAME}/quickstart-tutorials/jenkinsci-tutorials:cpp_agent_${BRANCH_SUFFIX}
+    container_name: desktop-jenkins_agent-1-cpp
+    profiles:
+      - cpp
+    depends_on:
+      sidekick_service:
+        condition: service_completed_successfully
+      jenkins_controller:
+        condition: service_started
+    healthcheck:
+      test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
+      interval: 5s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - agent-ssh-dir:/home/jenkins/.ssh:ro
 volumes:
   jenkins_home: null
   empty_jenkins_home: null

dockerfiles/cpp/Dockerfile

@@ -0,0 +1,19 @@
+FROM jenkins/ssh-agent:6.9.0
+
+# Install necessary C++ build tools
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    build-essential \
+    cmake \
+    gcc \
+    g++ \
+    clang \
+    make \
+    libstdc++-12-dev \
+    pkg-config \
+    && rm -rf /var/lib/apt/lists/*
+
+# Set environment variables
+ENV PATH="/usr/local/bin:$PATH"
+
+# Ensure the ownership of the Jenkins agent home directory is set to the Jenkins user
+RUN chown -R jenkins:jenkins "${JENKINS_AGENT_HOME}"

dockerfiles/plugins.txt

@@ -1,12 +1,12 @@
 ant:511.v0a_a_1a_334f41b_
 antisamy-markup-formatter:162.v0e6ec0fcfcf6
 apache-httpcomponents-client-4-api:4.5.14-269.vfa_2321039a_83
-bootstrap5-api:5.3.3-1
+bootstrap5-api:5.3.3-2
 bouncycastle-api:2.30.1.80-256.vf98926042a_9b_
 branch-api:2.1214.v3f652804588d
-build-timeout:1.35
-caffeine-api:3.1.8-133.v17b_1ff2e0599
-checks-api:2.2.2
+build-timeout:1.36
+caffeine-api:3.2.0-161.v691ef352cee1
+checks-api:2.2.3
 cloudbees-folder:6.982.vf165a_16c9507
 commons-lang3-api:3.17.0-84.vb_b_938040b_078
 commons-text-api:1.13.0-153.v91dcd89e2a_22
@@ -15,8 +15,8 @@ credentials-binding:687.v619cb_15e923f
 credentials:1408.va_622a_b_f5b_1b_1
 display-url-api:2.209.v582ed814ff2f
 durable-task:581.v299a_5609d767
-echarts-api:5.5.1-5
-font-awesome-api:6.6.0-2
+echarts-api:5.5.1-6
+font-awesome-api:6.7.2-1
 git-client:6.1.2
 git:5.7.0
 github-api:1.321-478.vc9ce627ce001
@@ -25,15 +25,15 @@ github:1.41.0
 gradle:2.14
 instance-identity:201.vd2a_b_5a_468a_a_6
 ionicons-api:74.v93d5eb_813d5f
-jackson2-api:2.17.0-386.vcb_b_037da_0d62
+jackson2-api:2.17.0-389.va_5c7e45cd806
 jakarta-activation-api:2.1.3-1
 jakarta-mail-api:2.1.3-1
 javax-activation-api:1.2.0-7
 javax-mail-api:1.6.2-10
 jaxb:2.3.9-1
 jjwt-api:0.11.5-112.ve82dfb_224b_a_d
-jquery3-api:3.7.1-2
-junit:1314.vd966e9a_88895
+jquery3-api:3.7.1-3
+junit:1316.v13ec14a_de230
 locale:560.vc5b_91b_3a_2b_68
 mailer:489.vd4b_25144138f
 matrix-auth:3.2.4
@@ -43,8 +43,8 @@ mina-sshd-api-common:2.14.0-143.v2b_362fc39576
 mina-sshd-api-core:2.14.0-143.v2b_362fc39576
 okhttp-api:4.11.0-183.va_87fc7a_89810
 pipeline-build-step:555.v589d5c24a_3d6
-pipeline-graph-analysis:216.vfd8b_ece330ca_
-pipeline-graph-view:409.v98f212e980b_4
+pipeline-graph-analysis:231.v56354571a_da_0
+pipeline-graph-view:413.v204a_03785b_92
 pipeline-groovy-lib:752.vdddedf804e72
 pipeline-input-step:513.v7eb_fe7e2c0fc
 pipeline-milestone-step:119.vdfdc43fc3b_9a_
@@ -56,7 +56,7 @@ pipeline-stage-step:312.v8cd10304c27a_
 pipeline-stage-tags-metadata:2.2221.vc657003fb_d93
 pipeline-stage-view:2.37
 plain-credentials:183.va_de8f1dd5a_2b_
-plugin-util-api:5.1.0
+plugin-util-api:6.0.0
 resource-disposer:0.25
 scm-api:703.v72ff4b_259600
 script-security:1373.vb_b_4a_a_c26fa_00

updatecli/updatecli.d/ssh-agent.yaml

@@ -85,6 +85,16 @@ targets:
         matcher: jenkins/ssh-agent
     sourceid: jenkins/ssh-agent
     scmid: default
+  jenkins/cpp-agent:
+    name: '[jenkins/ssh-agent] Bump Docker image tag in "dockerfiles/cpp/Dockerfile"'
+    kind: dockerfile
+    spec:
+      file: dockerfiles/cpp/Dockerfile
+      instruction:
+        keyword: FROM
+        matcher: jenkins/ssh-agent
+    sourceid: jenkins/ssh-agent
+    scmid: default
   default-agent:
     name: '[jenkins/ssh-agent] Bump Docker image tag in "docker-compose.yaml"'
     kind: yaml