docker/Dockerfile

-FROM jenkins/jenkins:jdk11
+FROM jenkins/jenkins:lts-jdk17
 
 USER root
 

jobs/maven-indexer-exporter.yml

@@ -14,7 +14,7 @@
           trigger-note: false
           add-ci-message: true
           # secret jenkins token is generated when executing tox
-          secret-token: !include-raw: jobs/templates/jenkins-token
+          secret-token: !include-raw-verbatim: jobs/templates/jenkins-token
     dsl: !include-jinja2: templates/swh-build-docker-image.groovy.j2
 
 - project:

jobs/swh-docs.yaml

@@ -128,5 +128,5 @@
           add-ci-message: true
           cancel-pending-builds-on-update: true
           # secret jenkins token is generated when executing tox
-          secret-token: !include-raw: jobs/templates/jenkins-token
+          secret-token: !include-raw-verbatim: jobs/templates/jenkins-token
     dsl: !include-jinja2: templates/swh-docs-pipeline.groovy.j2

jobs/swh-environment.yaml

@@ -63,7 +63,7 @@
           add-ci-message: true
           cancel-pending-builds-on-update: true
           # secret jenkins token is generated when executing tox
-          secret-token: !include-raw: templates/jenkins-token
+          secret-token: !include-raw-verbatim: templates/jenkins-token
 
     dsl: !include-jinja2: templates/swh-docker-dev.groovy.j2
 

jobs/swh-mirror.yaml

@@ -29,6 +29,6 @@
           add-ci-message: true
           cancel-pending-builds-on-update: true
           # secret jenkins token is generated when executing tox
-          secret-token: !include-raw: jobs/templates/jenkins-token
+          secret-token: !include-raw-verbatim: jobs/templates/jenkins-token
 
     dsl: !include-jinja2: templates/swh-mirror-run-tests.groovy.j2

jobs/templates/incoming-tag.yaml

@@ -16,5 +16,5 @@
           trigger-note: false
           add-ci-message: true
           # secret jenkins token is generated when executing tox
-          secret-token: !include-raw: jenkins-token
+          secret-token: !include-raw-verbatim: jenkins-token
     dsl: !include-jinja2: incoming-tag.groovy.j2

jobs/templates/swh-pipeline.yaml

@@ -33,7 +33,7 @@
           add-ci-message: true
           cancel-pending-builds-on-update: true
           # secret jenkins token is generated when executing tox
-          secret-token: !include-raw: jenkins-token
+          secret-token: !include-raw-verbatim: jenkins-token
           branch-filter-type: RegexBasedFilter
           target-branch-regex: ^(?!(debian|pristine-tar)).*
     parameters:

jobs/tools/dockerfiles.groovy.j2

@@ -15,6 +15,9 @@ if ((startedByTimer || startedByUser || startedByPushToMaster) && !env.gitlabMer
   env.TAG_FOR_REAL = "false"
 }
 
+env.SCCACHE_REDIS_ENDPOINT = credential('sccache-redis-endpoint')
+env.SCCACHE_REDIS_PASSWORD = credential('sccache-redis-password')
+
 def container_registry = 'container-registry.softwareheritage.org/{{gitlab_project_name}}'
 def container_credential_id = 'gitlab-registry'
 

jobs/tools/dockerfiles.yaml

@@ -36,7 +36,7 @@
           add-ci-message: true
           cancel-pending-builds-on-update: true
           # secret jenkins token is generated when executing tox
-          secret-token: !include-raw: jobs/templates/jenkins-token
+          secret-token: !include-raw-verbatim: jobs/templates/jenkins-token
     wrappers:
       - timestamps
       - ansicolor

jobs/tools/jenkins-jobs-builder.yaml

@@ -20,7 +20,7 @@
           add-ci-message: true
           cancel-pending-builds-on-update: true
           # secret jenkins token is generated when executing tox
-          secret-token: !include-raw: jobs/templates/jenkins-token
+          secret-token: !include-raw-verbatim: jobs/templates/jenkins-token
 
     dsl: !include-jinja2: jenkins-jobs-builder.groovy.j2
 

jobs/tools/setup-gitlab-webhooks.yaml

@@ -17,7 +17,7 @@
           name: jenkins_token
           description: Secret webhooks token to trigger jobs
           # secret jenkins token is generated when executing tox
-          default: !include-raw: jobs/templates/jenkins-token
+          default: !include-raw-verbatim: jobs/templates/jenkins-token
 
     dsl: !include-jinja2: setup-gitlab-webhooks.groovy.j2
 

tox.ini

@@ -7,7 +7,7 @@ minversion = 4
 basepython = python3
 skip_install = true
 deps =
-  jenkins-job-builder >= 6
+  jenkins-job-builder >= 6.4.1
 
 [testenv:test]
 allowlist_externals = bash