Skip to content

Commit

Permalink
feat: add emo to infra instance
Browse files Browse the repository at this point in the history 
Signed-off-by: sebastien.heurtematte <[email protected]>
  • Loading branch information
@heurtematte @fredg02
heurtematte authored and fredg02 committed Oct 9, 2024
1 parent 5e73ab6 commit ae66632
Show file tree
Hide file tree
Showing 7 changed files with 666 additions and 56 deletions.
20 changes: 19 additions & 1 deletion instances/foundation-internal.infra/jenkins/configuration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,31 @@ unclassified:
name: "gitlab.eclipse.org"
readTimeout: 10
url: "https://gitlab.eclipse.org"
- apiTokenId: "gitlab-emo-api-token"
clientBuilderId: "autodetect"
connectionTimeout: 10
ignoreCertificateErrors: false
name: "gitlab.eclipse.org emo"
readTimeout: 10
url: "https://gitlab.eclipse.org"
gitLabServers:
servers:
- credentialsId: "gitlab-personal-access-token"
name: "gitlab.eclipse.org"
serverUrl: "https://gitlab.eclipse.org"
webhookSecretCredentialsId: "gitlab-webhook-secret"

- credentialsId: "gitlab-emo-personal-access-token"
name: "gitlab.eclipse.org emo"
serverUrl: "https://gitlab.eclipse.org"
webhookSecretCredentialsId: "gitlab-emo-webhook-secret"
hashicorpVault:
configuration:
disableChildPoliciesOverride: false
engineVersion: 2
timeout: 60
vaultCredentialId: "secretsmanager-approle"
vaultUrl: "https://secretsmanager.eclipse.org"

tool:
gradle:
installations:
Expand Down
205 changes: 201 additions & 4 deletions instances/foundation-internal.infra/target/config.json
View file

Large diffs are not rendered by default.

197 changes: 197 additions & 0 deletions instances/foundation-internal.infra/target/jenkins/configuration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,188 @@ jenkins:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "ubuntu-2204"
namespace: "foundation-internal-infra"
label: "ubuntu-2204"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2204:remoting-3206.3208.v409508a_675ff
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
ttyEnabled: true
command: ""
args: ""
instanceCap: -1
nodeUsageMode: EXCLUSIVE
envVars:
- envVar:
key: "JAVA_TOOL_OPTIONS"
value: ""
- envVar:
key: "JENKINS_REMOTING_JAVA_OPTS"
value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
- envVar:
key: "OPENJ9_JAVA_OPTIONS"
value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
- envVar:
key: "_JAVA_OPTIONS"
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-infra"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
configMapName: "known-hosts"
mountPath: "/home/jenkins/.ssh/"
subPath: "."
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/repository"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
yaml: |
apiVersion: v1
kind: Pod
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
subPath: settings-security.xml
readOnly: true
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings.xml
subPath: settings.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.m2/toolchains.xml
subPath: toolchains.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.mavenrc
subPath: .mavenrc
readOnly: true
volumes:
- name: m2-secret-dir
secret:
secretName: m2-secret-dir
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
- name: "ubuntu-2404"
namespace: "foundation-internal-infra"
label: "ubuntu-latest ubuntu-2404"
containers:
- name: "jnlp"
image: docker.io/eclipsecbi/jiro-agent-ubuntu-2404:remoting-3206.3208.v409508a_675ff
alwaysPullImage: true
livenessProbe:
failureThreshold: 0
initialDelaySeconds: 0
periodSeconds: 0
successThreshold: 0
timeoutSeconds: 0
ttyEnabled: true
command: ""
args: ""
instanceCap: -1
nodeUsageMode: EXCLUSIVE
envVars:
- envVar:
key: "JAVA_TOOL_OPTIONS"
value: ""
- envVar:
key: "JENKINS_REMOTING_JAVA_OPTS"
value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
- envVar:
key: "OPENJ9_JAVA_OPTIONS"
value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
- envVar:
key: "_JAVA_OPTIONS"
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-infra"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
configMapName: "known-hosts"
mountPath: "/home/jenkins/.ssh/"
subPath: "."
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/repository"
- emptyDirVolume:
memory: false
mountPath: "/home/jenkins/.m2/wrapper"
workspaceVolume:
emptyDirWorkspaceVolume:
memory: false
yaml: |
apiVersion: v1
kind: Pod
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
subPath: settings-security.xml
readOnly: true
- name: m2-secret-dir
mountPath: /home/jenkins/.m2/settings.xml
subPath: settings.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.m2/toolchains.xml
subPath: toolchains.xml
readOnly: true
- name: m2-dir
mountPath: /home/jenkins/.mavenrc
subPath: .mavenrc
readOnly: true
volumes:
- name: m2-secret-dir
secret:
secretName: m2-secret-dir
- name: m2-dir
configMap:
name: m2-dir
inheritYamlMergeStrategy: "true"
yamlMergeStrategy: "merge"
nodes:
- permanent:
labelString: "docker-build"
Expand Down Expand Up @@ -627,19 +809,32 @@ unclassified:
name: "gitlab.eclipse.org"
readTimeout: 10
url: "https://gitlab.eclipse.org"
- apiTokenId: "gitlab-emo-api-token"
clientBuilderId: "autodetect"
connectionTimeout: 10
ignoreCertificateErrors: false
name: "gitlab.eclipse.org emo"
readTimeout: 10
url: "https://gitlab.eclipse.org"
gitLabServers:
servers:
- credentialsId: "gitlab-personal-access-token"
name: "gitlab.eclipse.org"
serverUrl: "https://gitlab.eclipse.org"
webhookSecretCredentialsId: "gitlab-webhook-secret"
- credentialsId: "gitlab-emo-personal-access-token"
name: "gitlab.eclipse.org emo"
serverUrl: "https://gitlab.eclipse.org"
webhookSecretCredentialsId: "gitlab-emo-webhook-secret"
tool:
jdk:
installations:
- name: "openjdk-latest"
home: "/opt/tools/java/openjdk/latest"
- name: "openjdk-ea-latest"
home: "/opt/tools/java/openjdk/ea-latest"
- name: "openjdk-jdk24-latest"
home: "/opt/tools/java/openjdk/jdk-24/latest"
- name: "openjdk-jdk23-latest"
home: "/opt/tools/java/openjdk/jdk-23/latest"
- name: "openjdk-jdk22-latest"
Expand Down Expand Up @@ -769,6 +964,8 @@ tool:
installations:
- name: "apache-maven-latest"
home: "/opt/tools/apache-maven/latest"
- name: "apache-maven-3.9.9"
home: "/opt/tools/apache-maven/3.9.9"
- name: "apache-maven-3.9.6"
home: "/opt/tools/apache-maven/3.9.6"
- name: "apache-maven-3.9.5"
Expand Down
Loading

0 comments on commit ae66632

Please sign in to comment.