Skip to content

Commit

Permalink
Eclipse AJDT Termination and AspectJ Restructuring reviews
Browse files Browse the repository at this point in the history
  • Loading branch information
fredg02 committed Jan 8, 2024
1 parent 5d8241c commit ce7d52e
Show file tree
Hide file tree
Showing 26 changed files with 166 additions and 153 deletions.
6 changes: 0 additions & 6 deletions instances/tools.ajdt/config.jsonnet

This file was deleted.

1 change: 0 additions & 1 deletion instances/tools.ajdt/target/jenkins/title.js

This file was deleted.

11 changes: 0 additions & 11 deletions instances/tools.ajdt/target/k8s/namespace.json

This file was deleted.

12 changes: 0 additions & 12 deletions instances/tools.ajdt/target/k8s/service-account.json

This file was deleted.

6 changes: 6 additions & 0 deletions instances/tools.aspectj/config.jsonnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
project+: {
fullName: "tools.aspectj",
displayName: "Eclipse AspectJ"
},
}
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,31 @@
"accessControl": {
"primaryGroup": {
"id": -1,
"name": "tools.ajdt"
"name": "tools.aspectj"
},
"supplementalGroups": [ ],
"user": {
"id": -1,
"name": "genie.ajdt"
"name": "genie.aspectj"
}
},
"clouds": {
"kubernetes": {
"kind": "kubernetes",
"namespace": "ajdt",
"namespace": "aspectj",
"podRetention": "never",
"templates": {
"basic": {
"agentWorkdir": "/home/jenkins/jenkins-agent",
"docker": {
"aliases": [
"docker.io/eclipsecbi/jiro-agent-basic:latest",
"docker.io/eclipsecbijenkins/basic-agent:3160.vd76b_9ddd10cc",
"docker.io/eclipsecbijenkins/jenkins-agent:3160.vd76b_9ddd10cc",
"docker.io/eclipsecbi/jenkins-jnlp-agent:3160.vd76b_9ddd10cc"
"docker.io/eclipsecbi/jenkins-jnlp-agent:3160.vd76b_9ddd10cc",
"docker.io/eclipsecbijenkins/basic-agent:latest",
"docker.io/eclipsecbijenkins/jenkins-agent:latest",
"docker.io/eclipsecbi/jenkins-jnlp-agent:latest"
],
"context": "basic",
"dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-basic:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\", ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3160.vd76b_9ddd10cc/remoting-3160.vd76b_9ddd10cc.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3160.vd76b_9ddd10cc-3/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nUSER 10001:0\n",
Expand Down Expand Up @@ -116,9 +120,11 @@
"basic-ubuntu": {
"agentWorkdir": "/home/jenkins/jenkins-agent",
"docker": {
"aliases": [ ],
"aliases": [
"docker.io/eclipsecbi/jiro-agent-basic-ubuntu:latest"
],
"context": "basic-ubuntu",
"dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-basic-ubuntu:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\", ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3160.vd76b_9ddd10cc/remoting-3160.vd76b_9ddd10cc.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3160.vd76b_9ddd10cc-3/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nUSER 10001:0\n",
"dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-basic-ubuntu:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\", ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3160.vd76b_9ddd10cc/remoting-3160.vd76b_9ddd10cc.jar\" \"/usr/share/jenkins/agent.jar\"\nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3160.vd76b_9ddd10cc-3/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nUSER 10001:0\n",
"image": "jiro-agent-basic-ubuntu",
"registry": "docker.io",
"repository": "eclipsecbi",
Expand Down Expand Up @@ -210,10 +216,15 @@
"agentWorkdir": "/home/jenkins/jenkins-agent",
"docker": {
"aliases": [
"docker.io/eclipsecbi/jiro-agent-centos-7:latest",
"docker.io/eclipsecbijenkins/jipp-migration-agent:3160.vd76b_9ddd10cc",
"docker.io/eclipsecbijenkins/migration-fat-agent:3160.vd76b_9ddd10cc",
"docker.io/eclipsecbijenkins/ui-test-agent:3160.vd76b_9ddd10cc",
"docker.io/eclipsecbijenkins/ui-tests-agent:3160.vd76b_9ddd10cc"
"docker.io/eclipsecbijenkins/ui-tests-agent:3160.vd76b_9ddd10cc",
"docker.io/eclipsecbijenkins/jipp-migration-agent:latest",
"docker.io/eclipsecbijenkins/migration-fat-agent:latest",
"docker.io/eclipsecbijenkins/ui-test-agent:latest",
"docker.io/eclipsecbijenkins/ui-tests-agent:latest"
],
"context": "centos-7",
"dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-centos-7:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\", ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3160.vd76b_9ddd10cc/remoting-3160.vd76b_9ddd10cc.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3160.vd76b_9ddd10cc-3/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nUSER 10001:0\n",
Expand Down Expand Up @@ -309,7 +320,9 @@
"centos-8": {
"agentWorkdir": "/home/jenkins/jenkins-agent",
"docker": {
"aliases": [ ],
"aliases": [
"docker.io/eclipsecbi/jiro-agent-centos-8:latest"
],
"context": "centos-8",
"dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-centos-8:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\", ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3160.vd76b_9ddd10cc/remoting-3160.vd76b_9ddd10cc.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3160.vd76b_9ddd10cc-3/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nUSER 10001:0\n",
"image": "jiro-agent-centos-8",
Expand Down Expand Up @@ -408,14 +421,14 @@
"controlPort": 8081,
"host": "ci.eclipse.org",
"jnlpPort": 50000,
"prefix": "/ajdt",
"prefix": "/aspectj",
"uiPort": 8080,
"url": "https://ci.eclipse.org/ajdt"
"url": "https://ci.eclipse.org/aspectj"
},
"docker": {
"master": {
"dockerfile": "FROM docker.io/eclipsecbi/jiro-master:2.426.1\n\nEXPOSE 8080\nEXPOSE 50000\n\nCOPY jenkins/ref/plugins /usr/share/jenkins/ref/plugins\n\nRUN mkdir -p /usr/share/jenkins/ref/userContent/theme/\nCOPY jenkins/quicksilver.css.override /usr/share/jenkins/ref/userContent/theme/\nCOPY jenkins/title.js /usr/share/jenkins/ref/userContent/theme/\n\nUSER 10001\n",
"image": "tools.ajdt",
"image": "tools.aspectj",
"registry": "docker.io",
"repository": "eclipsecbijenkins",
"tag": "2.426.1"
Expand Down Expand Up @@ -465,7 +478,7 @@
},
{
"group": {
"name": "tools.ajdt",
"name": "tools.aspectj",
"permissions": [
"Agent/Build",
"Credentials/View",
Expand Down Expand Up @@ -587,10 +600,10 @@
"request": "4096Mi"
}
},
"namespace": "ajdt"
"namespace": "aspectj"
},
"master": {
"namespace": "ajdt",
"namespace": "aspectj",
"probe": {
"liveness": {
"delaySeconds": 480,
Expand All @@ -615,14 +628,14 @@
"request": "1536Mi"
}
},
"stsName": "ajdt"
"stsName": "aspectj"
}
},
"maven": {
"files": {
"settings-security.xml": {
"master": {
"pass": "bots/tools.ajdt/apache-maven-security-settings"
"pass": "bots/tools.aspectj/apache-maven-security-settings"
}
},
"settings.xml": {
Expand All @@ -637,16 +650,16 @@
"servers": {
"gpg.passphrase": {
"passphrase": {
"pass": "bots/tools.ajdt/gpg/passphrase"
"pass": "bots/tools.aspectj/gpg/passphrase"
}
},
"ossrh": {
"nexusProUrl": "https://oss.sonatype.org",
"password": {
"pass": "bots/tools.ajdt/oss.sonatype.org/password"
"pass": "bots/tools.aspectj/oss.sonatype.org/password"
},
"username": {
"pass": "bots/tools.ajdt/oss.sonatype.org/username"
"pass": "bots/tools.aspectj/oss.sonatype.org/username"
}
},
"repo.eclipse.org": {
Expand All @@ -667,11 +680,11 @@
"transferListenerLogLevel": "warn"
},
"project": {
"displayName": "Eclipse AJDT",
"fullName": "tools.ajdt",
"displayName": "Eclipse AspectJ",
"fullName": "tools.aspectj",
"resourcePacks": 1,
"shortName": "ajdt",
"unixGroupName": "tools.ajdt"
"shortName": "aspectj",
"unixGroupName": "tools.aspectj"
},
"sbt": {
"files": {
Expand All @@ -690,8 +703,8 @@
},
"secrets": {
"dockerconfigjson": {
"dockerconfigjson-for-pull-as-ajdt": {
"namespace": "ajdt",
"dockerconfigjson-for-pull-as-aspectj": {
"namespace": "aspectj",
"servers": {
"https://index.docker.io/v1/": {
"password": {
Expand All @@ -702,13 +715,13 @@
}
}
},
"serviceAccount": "ajdt",
"serviceAccount": "aspectj",
"type": [
"pull"
]
},
"dockerconfigjson-for-pull-as-default": {
"namespace": "ajdt",
"namespace": "aspectj",
"servers": {
"https://index.docker.io/v1/": {
"password": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jenkins:
permissions:
- Job/ExtendedRead
- group:
name: tools.ajdt
name: tools.aspectj
permissions:
- Agent/Build
- Credentials/View
Expand Down Expand Up @@ -76,14 +76,14 @@ jenkins:
- kubernetes:
name: "kubernetes"
containerCapStr: "2"
jenkinsUrl: "http://jenkins-ui.ajdt.svc.cluster.local/ajdt"
jenkinsTunnel: "jenkins-discovery.ajdt.svc.cluster.local:50000"
jenkinsUrl: "http://jenkins-ui.aspectj.svc.cluster.local/aspectj"
jenkinsTunnel: "jenkins-discovery.aspectj.svc.cluster.local:50000"
maxRequestsPerHostStr: "32"
namespace: "ajdt"
namespace: "aspectj"
podRetention: "never"
templates:
- name: "basic"
namespace: "ajdt"
namespace: "aspectj"
label: "basic"
containers:
- name: "jnlp"
Expand Down Expand Up @@ -119,7 +119,7 @@ jenkins:
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-ajdt"
claimName: "tools-claim-jiro-aspectj"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
Expand Down Expand Up @@ -169,7 +169,7 @@ jenkins:
configMap:
name: m2-dir
- name: "basic-ubuntu"
namespace: "ajdt"
namespace: "aspectj"
label: "basic-ubuntu"
containers:
- name: "jnlp"
Expand Down Expand Up @@ -205,7 +205,7 @@ jenkins:
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-ajdt"
claimName: "tools-claim-jiro-aspectj"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
Expand Down Expand Up @@ -255,7 +255,7 @@ jenkins:
configMap:
name: m2-dir
- name: "centos-7"
namespace: "ajdt"
namespace: "aspectj"
label: "migration jipp-migration centos-7"
containers:
- name: "jnlp"
Expand Down Expand Up @@ -291,7 +291,7 @@ jenkins:
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-ajdt"
claimName: "tools-claim-jiro-aspectj"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
Expand Down Expand Up @@ -341,7 +341,7 @@ jenkins:
configMap:
name: m2-dir
- name: "centos-8"
namespace: "ajdt"
namespace: "aspectj"
label: "centos-latest centos-8"
containers:
- name: "jnlp"
Expand Down Expand Up @@ -377,7 +377,7 @@ jenkins:
value: ""
volumes:
- persistentVolumeClaim:
claimName: "tools-claim-jiro-ajdt"
claimName: "tools-claim-jiro-aspectj"
mountPath: "/opt/tools"
readOnly: true
- configMapVolume:
Expand Down Expand Up @@ -457,16 +457,16 @@ appearance:
simpleTheme:
elements:
- cssUrl:
url: "/ajdt/userContent/theme/quicksilver.css"
url: "/aspectj/userContent/theme/quicksilver.css"
- cssUrl:
url: "//fonts.googleapis.com/css?family=Libre+Franklin:400,700,300,600,100"
- jsUrl:
url: "/ajdt/userContent/theme/title.js"
url: "/aspectj/userContent/theme/title.js"

unclassified:
location:
adminAddress: [email protected]
url: https://ci.eclipse.org/ajdt
url: https://ci.eclipse.org/aspectj

mailer:
replyToAddress: [email protected]
Expand Down Expand Up @@ -508,7 +508,7 @@ unclassified:
manageHooks: false
hookSecretConfigs:
- credentialsId: "github-webhook-secret"
hookUrl: "https://ci.eclipse.org/ajdt/github-webhook/"
hookUrl: "https://ci.eclipse.org/aspectj/github-webhook/"

scmGit:
createAccountBasedOnEmail: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
permissions:
- Job/ExtendedRead
- group:
name: tools.ajdt
name: tools.aspectj
permissions:
- Agent/Build
- Credentials/View
Expand Down
Loading

0 comments on commit ce7d52e

Please sign in to comment.