Skip to content

Commit

Permalink
Update to latest Jenkins LTS 2.414.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@fredg02
fredg02 committed Sep 29, 2023
1 parent e048696 commit 2aa39e5
Show file tree
Hide file tree
Showing 252 changed files with 7,525 additions and 6,307 deletions.
5 changes: 1 addition & 4 deletions instances/foundation-internal.infra/config.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ local permissionsTemplates = import '../../templates/permissions.libsonnet';
prefix: "/ci/" + $.project.shortName,
},
jenkins+: {
version: "2.401.1",
version: "2.414.2",
staticAgentCount: 1,
permissions: [
{
Expand Down Expand Up @@ -79,7 +79,4 @@ local permissionsTemplates = import '../../templates/permissions.libsonnet';
namespace: "foundation-internal-infra"
}
},
secrets+: {
"gerrit-trigger-plugin": {},
},
}
2 changes: 2 additions & 0 deletions instances/foundation-internal.infra/jenkins/configuration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ security:
gitlab.eclipse.org,141.94.179.217 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCl6Wwb+m463X7a05TsllEYEmRklkwUWgqHVcvxsW6l6n9tPNcUWrcfTWupMQoONe7PuBsr6SkiYXRcSjHJy9qDXo5Nz/F/IU+EQ+haTU5pGfMRXAsQfdAB0AR5mSPOTkurRHL1sGi6jtp2wpgkbEfykcuEnmg36BCBqsARl08K6OuI2CtrKevXN0x5S5bF6vgzmvUm4aRQnF7WIg7HSOYVZIH5QGHsxsqr045xGLyk0scEIz6ZdslsinGYyvg8J9d6WJJebtjMX+KBHtXYKrFx0xqqnIYSj3WACaP32GDVFqPpxeNmJaVIJuymxsxxQMGYCsJT9diDv3dI+efu5xb
gitlab.eclipse.org,141.94.179.217 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIPik0+gkBsbyVzTLvDq4ESZJMlUSZeb/tjdOHPbTLcSSlHX8R4CdqQwjWdxi4AMQ/76FXUsNH2azvkvgSh/r+E=
gitlab.eclipse.org,141.94.179.217 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBsuD5uVWgjZX3jrcvdWu0DwbbarL32mfbNAVABi4wCc
foundation.eclipse.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILoJ6gWaWRik6fNxqGWVkb5isJOC6Pu8z5tGv7V2LMVX
[foundation.eclipse.org]:29418,[172.25.25.206]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArAdc5w86HX4vPtqpUVir4WuNWJVTLv8f5X3UuCxbCzlYUljvRRteW4O19D2Ud4ClHK+Bw54nYW1kKgPslUGcM6Qeb3iPLK43TQOqjOYDSjy11iXeZ0SaYLsGgibRPT+VLZGAHqbmXvYxuK68vuCQCwgAQ1e02OcAQMX0t/0TboaFtdz0dQeX6y3gztpw87HzNOzKBxbJ13cMlqqysXoZ420huu8+oSwGfIHCRl8z39KnNmBxyOpE/Kzwl0YvGIZSPVGOuuI+24R53bNYT69n4cOuAk/VTa7JAC+i9cN6T3tDDDk9TrKezZtKvHYLZDXEIOCgj56rB7kvA+Ub0jnAgw==
[foundation.eclipse.org]:29418 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBkIIXQt8hQ/2xqrDc7n9iat1JQwiCoBT8JecHbk+COS
20.104.233.12 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDkH1ET4ScUfV5JHHr7f7dOg4jHg09SL2Q03ST6oAmC5yxmU52uu8vhUZRM5H5zjrW4ml7/U4s+J3LyUHNtcQq5xqBrQCDc2uSXUTFeShp3FeehHRvvOzlJqSANvQj+0Qdxb/aU0lxAYXaLsRy+HEH75aSceTXYDFvVjygteBApVFAaTCNYlDNPsxMUQ1ZKi7cy7DPT1w6PVpGO+9i7WXHkMCJlhOLf6ivJWgH5NtcHJMAxs7fGHYPjn8rUJlSAY/Hg1bT5JcGAdNWxsaCmKMucaGBeHz2E+hXtx6k4ye5fJqlFuWkxfWyJSewmoNrilACl9XKp5mPbVZyCZCDJCtVYkT6gf3nm5bTiSfIBb5fLM1eVKssa2PNcEW7sajRKEpw6GKcD0a1gj1ERbZapVWk42AD9TCIeaT8SniZrq60n5E/SVRBQvoCArdLIQgfm4zflUsH/gFeMFMV/PvQ6vrbRCd+fhbnaRWFVOpUUwwMaM+8OXCbS9XOPge8B2wqOVqk=
unclassified:
Expand Down
2 changes: 1 addition & 1 deletion instances/foundation-internal.infra/target/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/eclipsecbi/jiro-master:2.401.1
FROM docker.io/eclipsecbi/jiro-master:2.414.2

EXPOSE 8080
EXPOSE 50000
Expand Down
105 changes: 45 additions & 60 deletions instances/foundation-internal.infra/target/config.json
View file

Large diffs are not rendered by default.

119 changes: 77 additions & 42 deletions instances/foundation-internal.infra/target/jenkins/configuration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,44 +18,77 @@ jenkins:
- "Ping"
authorizationStrategy:
projectMatrix:
permissions:
- "GROUP:Overall/Administer:admins"
- "USER:Job/Discover:anonymous"
- "USER:Overall/Read:anonymous"
- "USER:Agent/Build:[email protected]"
- "USER:Overall/Read:[email protected]"
- "USER:Agent/Build:[email protected]"
- "USER:Overall/Read:[email protected]"
- "GROUP:Agent/Build:foundation-internal.it"
- "GROUP:Credentials/View:foundation-internal.it"
- "GROUP:Job/Build:foundation-internal.it"
- "GROUP:Job/Cancel:foundation-internal.it"
- "GROUP:Job/Configure:foundation-internal.it"
- "GROUP:Job/Create:foundation-internal.it"
- "GROUP:Job/Delete:foundation-internal.it"
- "GROUP:Job/Move:foundation-internal.it"
- "GROUP:Job/Read:foundation-internal.it"
- "GROUP:Job/Workspace:foundation-internal.it"
- "GROUP:Overall/Read:foundation-internal.it"
- "GROUP:Run/Delete:foundation-internal.it"
- "GROUP:Run/Replay:foundation-internal.it"
- "GROUP:Run/Update:foundation-internal.it"
- "GROUP:SCM/Tag:foundation-internal.it"
- "GROUP:View/Configure:foundation-internal.it"
- "GROUP:View/Create:foundation-internal.it"
- "GROUP:View/Delete:foundation-internal.it"
- "GROUP:View/Read:foundation-internal.it"
- "GROUP:Overall/Read:foundation-internal.webdev"
- "USER:Agent/Build:[email protected]"
- "USER:Overall/Read:[email protected]"
- "USER:Agent/Build:[email protected]"
- "USER:Overall/Read:[email protected]"
- "USER:Agent/Build:[email protected]"
- "USER:Overall/Read:[email protected]"
- "USER:Agent/Build:[email protected]"
- "USER:Overall/Read:[email protected]"
- "USER:Agent/Build:[email protected]"
- "USER:Overall/Read:[email protected]"
entries:
- group:
name: admins
permissions:
- Overall/Administer
- user:
name: anonymous
permissions:
- Job/Discover
- Overall/Read
- user:
name: [email protected]
permissions:
- Agent/Build
- Overall/Read
- user:
name: [email protected]
permissions:
- Agent/Build
- Overall/Read
- group:
name: foundation-internal.it
permissions:
- Agent/Build
- Credentials/View
- Job/Build
- Job/Cancel
- Job/Configure
- Job/Create
- Job/Delete
- Job/Move
- Job/Read
- Job/Workspace
- Overall/Read
- Run/Delete
- Run/Replay
- Run/Update
- SCM/Tag
- View/Configure
- View/Create
- View/Delete
- View/Read
- group:
name: foundation-internal.webdev
permissions:
- Overall/Read
- user:
name: [email protected]
permissions:
- Agent/Build
- Overall/Read
- user:
name: [email protected]
permissions:
- Agent/Build
- Overall/Read
- user:
name: [email protected]
permissions:
- Agent/Build
- Overall/Read
- user:
name: [email protected]
permissions:
- Agent/Build
- Overall/Read
- user:
name: [email protected]
permissions:
- Agent/Build
- Overall/Read
markupFormatter: rawHtml
crumbIssuer:
standard:
Expand Down Expand Up @@ -84,7 +117,7 @@ jenkins:
label: "basic"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3107.v665000b_51092
image: docker.io/eclipsecbi/jiro-agent-basic:remoting-3131.vf2b_b_798b_ce99
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
Expand Down Expand Up @@ -170,7 +203,7 @@ jenkins:
label: "basic-ubuntu"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3107.v665000b_51092
image: docker.io/eclipsecbi/jiro-agent-basic-ubuntu:remoting-3131.vf2b_b_798b_ce99
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
Expand Down Expand Up @@ -256,7 +289,7 @@ jenkins:
label: "migration jipp-migration centos-7"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3107.v665000b_51092
image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3131.vf2b_b_798b_ce99
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
Expand Down Expand Up @@ -342,7 +375,7 @@ jenkins:
label: "centos-latest centos-8"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3107.v665000b_51092
image: docker.io/eclipsecbi/jiro-agent-centos-8:remoting-3131.vf2b_b_798b_ce99
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
Expand Down Expand Up @@ -682,6 +715,8 @@ tool:
installations:
- name: "apache-maven-latest"
home: "/opt/tools/apache-maven/latest"
- name: "apache-maven-3.9.3"
home: "/opt/tools/apache-maven/3.9.3"
- name: "apache-maven-3.9.2"
home: "/opt/tools/apache-maven/3.9.2"
- name: "apache-maven-3.9.1"
Expand Down
107 changes: 70 additions & 37 deletions instances/foundation-internal.infra/target/jenkins/partials/permissions.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,70 @@
- "GROUP:Overall/Administer:admins"
- "USER:Job/Discover:anonymous"
- "USER:Overall/Read:anonymous"
- "USER:Agent/Build:[email protected]"
- "USER:Overall/Read:[email protected]"
- "USER:Agent/Build:[email protected]"
- "USER:Overall/Read:[email protected]"
- "GROUP:Agent/Build:foundation-internal.it"
- "GROUP:Credentials/View:foundation-internal.it"
- "GROUP:Job/Build:foundation-internal.it"
- "GROUP:Job/Cancel:foundation-internal.it"
- "GROUP:Job/Configure:foundation-internal.it"
- "GROUP:Job/Create:foundation-internal.it"
- "GROUP:Job/Delete:foundation-internal.it"
- "GROUP:Job/Move:foundation-internal.it"
- "GROUP:Job/Read:foundation-internal.it"
- "GROUP:Job/Workspace:foundation-internal.it"
- "GROUP:Overall/Read:foundation-internal.it"
- "GROUP:Run/Delete:foundation-internal.it"
- "GROUP:Run/Replay:foundation-internal.it"
- "GROUP:Run/Update:foundation-internal.it"
- "GROUP:SCM/Tag:foundation-internal.it"
- "GROUP:View/Configure:foundation-internal.it"
- "GROUP:View/Create:foundation-internal.it"
- "GROUP:View/Delete:foundation-internal.it"
- "GROUP:View/Read:foundation-internal.it"
- "GROUP:Overall/Read:foundation-internal.webdev"
- "USER:Agent/Build:[email protected]"
- "USER:Overall/Read:[email protected]"
- "USER:Agent/Build:[email protected]"
- "USER:Overall/Read:[email protected]"
- "USER:Agent/Build:[email protected]"
- "USER:Overall/Read:[email protected]"
- "USER:Agent/Build:[email protected]"
- "USER:Overall/Read:[email protected]"
- "USER:Agent/Build:[email protected]"
- "USER:Overall/Read:[email protected]"
- group:
name: admins
permissions:
- Overall/Administer
- user:
name: anonymous
permissions:
- Job/Discover
- Overall/Read
- user:
name: [email protected]
permissions:
- Agent/Build
- Overall/Read
- user:
name: [email protected]
permissions:
- Agent/Build
- Overall/Read
- group:
name: foundation-internal.it
permissions:
- Agent/Build
- Credentials/View
- Job/Build
- Job/Cancel
- Job/Configure
- Job/Create
- Job/Delete
- Job/Move
- Job/Read
- Job/Workspace
- Overall/Read
- Run/Delete
- Run/Replay
- Run/Update
- SCM/Tag
- View/Configure
- View/Create
- View/Delete
- View/Read
- group:
name: foundation-internal.webdev
permissions:
- Overall/Read
- user:
name: [email protected]
permissions:
- Agent/Build
- Overall/Read
- user:
name: [email protected]
permissions:
- Agent/Build
- Overall/Read
- user:
name: [email protected]
permissions:
- Agent/Build
- Overall/Read
- user:
name: [email protected]
permissions:
- Agent/Build
- Overall/Read
- user:
name: [email protected]
permissions:
- Agent/Build
- Overall/Read
Loading

0 comments on commit 2aa39e5

Please sign in to comment.