Skip to content

Commit

Permalink
feat: add pipeline utility steps plugin on cdo
Browse files Browse the repository at this point in the history 
Related to https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/4824

Signed-off-by: sebastien.heurtematte <[email protected]>
  • Loading branch information
@heurtematte
heurtematte committed Jul 15, 2024
1 parent 36e0e1f commit 65ffd67
Show file tree
Hide file tree
Showing 6 changed files with 135 additions and 79 deletions.
1 change: 1 addition & 0 deletions instances/modeling.emf.cdo/config.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
plugins+: [
"build-name-setter",
"mail-watcher-plugin",
"pipeline-utility-steps",
"zentimestamp",
],
},
Expand Down
18 changes: 14 additions & 4 deletions instances/modeling.emf.cdo/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 @@ -484,6 +492,7 @@
"plugins": [
"build-name-setter",
"mail-watcher-plugin",
"pipeline-utility-steps",
"zentimestamp"
],
"pluginsForceUpgrade": true,
Expand Down Expand Up @@ -515,6 +524,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/modeling.emf.cdo/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: "cdo"
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: "cdo"
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: "cdo"
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"
nodes:
- permanent:
name: "promotion-vm"
Expand Down
1 change: 1 addition & 0 deletions instances/modeling.emf.cdo/target/jenkins/plugins-list.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# GENERATED FILE - DO NOT EDIT
build-name-setter
mail-watcher-plugin
pipeline-utility-steps
zentimestamp
Loading

0 comments on commit 65ffd67

Please sign in to comment.