Skip to content

Commit

Permalink
feat: update plugins on oomph
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 15, 2024
1 parent f909308 commit 36e0e1f
Show file tree
Hide file tree
Showing 4 changed files with 151 additions and 88 deletions.
21 changes: 16 additions & 5 deletions instances/tools.oomph/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 @@ -420,6 +428,7 @@
},
"home": "/home/jenkins",
"kubernetes": {
"inheritYamlMergeStrategy": true,
"resources": {
"cpu": {
"limit": "2000m",
Expand Down Expand Up @@ -463,7 +472,8 @@
],
"name": "m2-dir"
}
]
],
"yamlMergeStrategy": "merge"
},
"labels": [
"basic-8gb"
Expand Down Expand Up @@ -609,6 +619,7 @@
"authorize-project",
"bouncycastle-api",
"build-timeout",
"cloudbees-disk-usage-simple",
"cloudbees-folder",
"command-launcher",
"config-file-provider",
Expand Down
65 changes: 45 additions & 20 deletions instances/tools.oomph/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: "oomph"
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: "oomph"
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: "oomph"
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"
- name: "jipp-basic-agent-8gb"
namespace: "oomph"
label: "basic-8gb"
Expand All @@ -434,10 +454,6 @@ jenkins:
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
resourceLimitCpu: "2000m"
resourceRequestCpu: "2000m"
resourceLimitMemory: "8Gi"
resourceRequestMemory: "8Gi"
ttyEnabled: true
command: ""
args: ""
Expand Down Expand Up @@ -483,6 +499,13 @@ jenkins:
spec:
containers:
- name: jnlp
resources:
limits:
cpu: "2000m"
memory: "8Gi"
requests:
cpu: "2000m"
memory: "8Gi"
volumeMounts:
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings-security.xml
Expand All @@ -507,6 +530,8 @@ jenkins:
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
nodes:
- permanent:
name: "promotion-vm"
Expand Down
Loading

0 comments on commit 36e0e1f

Please sign in to comment.