Skip to content

Commit

Permalink
feat: update instance windowbuilder
Browse files Browse the repository at this point in the history 
Signed-off-by: sebastien.heurtematte <[email protected]>
  • Loading branch information
@heurtematte
heurtematte committed Jul 11, 2024
1 parent eac17f9 commit 7be3a3c
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 36 deletions.
17 changes: 13 additions & 4 deletions instances/tools.windowbuilder/target/config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
},
"home": "/home/jenkins",
"kubernetes": {
"inheritYamlMergeStrategy": true,
"resources": {
"cpu": {
"limit": "2000m",
Expand Down Expand Up @@ -88,7 +89,8 @@
],
"name": "m2-dir"
}
]
],
"yamlMergeStrategy": "merge"
},
"labels": [
"basic"
Expand Down Expand Up @@ -138,6 +140,7 @@
},
"home": "/home/jenkins",
"kubernetes": {
"inheritYamlMergeStrategy": true,
"resources": {
"cpu": {
"limit": "2000m",
Expand Down Expand Up @@ -181,7 +184,8 @@
],
"name": "m2-dir"
}
]
],
"yamlMergeStrategy": "merge"
},
"labels": [
"basic-ubuntu"
Expand Down Expand Up @@ -231,6 +235,7 @@
},
"home": "/home/jenkins",
"kubernetes": {
"inheritYamlMergeStrategy": true,
"resources": {
"cpu": {
"limit": "2000m",
Expand Down Expand Up @@ -274,7 +279,8 @@
],
"name": "m2-dir"
}
]
],
"yamlMergeStrategy": "merge"
},
"labels": [
"migration",
Expand Down Expand Up @@ -326,6 +332,7 @@
},
"home": "/home/jenkins",
"kubernetes": {
"inheritYamlMergeStrategy": true,
"resources": {
"cpu": {
"limit": "2000m",
Expand Down Expand Up @@ -369,7 +376,8 @@
],
"name": "m2-dir"
}
]
],
"yamlMergeStrategy": "merge"
},
"labels": [
"centos-latest",
Expand Down Expand Up @@ -511,6 +519,7 @@
"authorize-project",
"bouncycastle-api",
"build-timeout",
"cloudbees-disk-usage-simple",
"cloudbees-folder",
"command-launcher",
"config-file-provider",
Expand Down
52 changes: 36 additions & 16 deletions instances/tools.windowbuilder/target/jenkins/configuration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,6 @@ jenkins:
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "1000m"
resourceLimitMemory: "4096Mi"
resourceRequestMemory: "4096Mi"
ttyEnabled: true
command: ""
args: ""
Expand Down Expand Up @@ -139,6 +135,13 @@ jenkins:
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
Expand All @@ -163,6 +166,8 @@ jenkins:
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "basic-ubuntu"
namespace: "windowbuilder"
label: "basic-ubuntu"
Expand All @@ -176,10 +181,6 @@ jenkins:
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "1000m"
resourceLimitMemory: "4096Mi"
resourceRequestMemory: "4096Mi"
ttyEnabled: true
command: ""
args: ""
Expand Down Expand Up @@ -225,6 +226,13 @@ jenkins:
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
Expand All @@ -249,6 +257,8 @@ jenkins:
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-7"
namespace: "windowbuilder"
label: "migration jipp-migration centos-7"
Expand All @@ -262,10 +272,6 @@ jenkins:
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "1000m"
resourceLimitMemory: "4096Mi"
resourceRequestMemory: "4096Mi"
ttyEnabled: true
command: ""
args: ""
Expand Down Expand Up @@ -311,6 +317,13 @@ jenkins:
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
Expand All @@ -335,6 +348,8 @@ jenkins:
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-8"
namespace: "windowbuilder"
label: "centos-latest centos-8"
Expand All @@ -348,10 +363,6 @@ jenkins:
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "1000m"
resourceLimitMemory: "4096Mi"
resourceRequestMemory: "4096Mi"
ttyEnabled: true
command: ""
args: ""
Expand Down Expand Up @@ -397,6 +408,13 @@ jenkins:
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
Expand All @@ -421,6 +439,8 @@ jenkins:
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
security:
apiToken:
creationOfLegacyTokenEnabled: false
Expand Down
52 changes: 36 additions & 16 deletions instances/tools.windowbuilder/target/k8s/configmap-jenkins-config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,6 @@ data:
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "1000m"
resourceLimitMemory: "4096Mi"
resourceRequestMemory: "4096Mi"
ttyEnabled: true
command: ""
args: ""
Expand Down Expand Up @@ -162,6 +158,13 @@ data:
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
Expand All @@ -186,6 +189,8 @@ data:
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "basic-ubuntu"
namespace: "windowbuilder"
label: "basic-ubuntu"
Expand All @@ -199,10 +204,6 @@ data:
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "1000m"
resourceLimitMemory: "4096Mi"
resourceRequestMemory: "4096Mi"
ttyEnabled: true
command: ""
args: ""
Expand Down Expand Up @@ -248,6 +249,13 @@ data:
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
Expand All @@ -272,6 +280,8 @@ data:
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-7"
namespace: "windowbuilder"
label: "migration jipp-migration centos-7"
Expand All @@ -285,10 +295,6 @@ data:
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "1000m"
resourceLimitMemory: "4096Mi"
resourceRequestMemory: "4096Mi"
ttyEnabled: true
command: ""
args: ""
Expand Down Expand Up @@ -334,6 +340,13 @@ data:
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
Expand All @@ -358,6 +371,8 @@ data:
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "centos-8"
namespace: "windowbuilder"
label: "centos-latest centos-8"
Expand All @@ -371,10 +386,6 @@ data:
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "1000m"
resourceLimitMemory: "4096Mi"
resourceRequestMemory: "4096Mi"
ttyEnabled: true
command: ""
args: ""
Expand Down Expand Up @@ -420,6 +431,13 @@ data:
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "4096Mi"
requests:
cpu: "1000m"
memory: "4096Mi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
Expand All @@ -444,6 +462,8 @@ data:
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
security:
apiToken:
creationOfLegacyTokenEnabled: false
Expand Down

0 comments on commit 7be3a3c

Please sign in to comment.