From eca87ceb5db76503eacb818dd81249622e9f97e8 Mon Sep 17 00:00:00 2001 From: Pawel Stankiewicz Date: Fri, 29 Sep 2023 14:46:28 +0200 Subject: [PATCH] Rename JIRO bean-validation to validation. EF issue https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/3728 Signed-off-by: Pawel Stankiewicz --- instances/ee4j.bean-validation/config.jsonnet | 6 --- .../target/jenkins/title.js | 1 - .../target/k8s/namespace.json | 11 ----- .../target/k8s/role-binding.json | 24 ---------- .../target/k8s/service-account.json | 12 ----- instances/ee4j.validation/config.jsonnet | 6 +++ .../jiro.jsonnet | 0 .../target/Dockerfile | 0 .../target/config.json | 48 +++++++++---------- .../target/jenkins/configuration.yml | 32 ++++++------- .../target/jenkins/partials/permissions.hbs | 2 +- .../target/jenkins/plugins-list.txt | 0 .../target/jenkins/plugins.log | 8 ++-- .../target/jenkins/quicksilver.css.override | 2 +- .../ee4j.validation/target/jenkins/title.js | 1 + .../target/k8s/configmap-jenkins-config.yml | 40 ++++++++-------- .../target/k8s/known-hosts.json | 6 +-- .../target/k8s/limit-range.json | 6 +-- .../target/k8s/m2-dir.json | 6 +-- .../ee4j.validation/target/k8s/namespace.json | 11 +++++ .../target/k8s/resource-quotas.json | 6 +-- .../target/k8s/role-binding.json | 24 ++++++++++ .../target/k8s/role.json | 6 +-- .../target/k8s/route.json | 10 ++-- .../target/k8s/service-account.json | 12 +++++ .../target/k8s/service-jenkins-discovery.json | 8 ++-- .../target/k8s/service-jenkins-ui.json | 8 ++-- .../target/k8s/statefulset.json | 28 +++++------ .../target/k8s/tools-pv.json | 18 +++---- 29 files changed, 171 insertions(+), 171 deletions(-) delete mode 100644 instances/ee4j.bean-validation/config.jsonnet delete mode 100644 instances/ee4j.bean-validation/target/jenkins/title.js delete mode 100644 instances/ee4j.bean-validation/target/k8s/namespace.json delete mode 100644 instances/ee4j.bean-validation/target/k8s/role-binding.json delete mode 100644 instances/ee4j.bean-validation/target/k8s/service-account.json create mode 100644 instances/ee4j.validation/config.jsonnet rename instances/{ee4j.bean-validation => ee4j.validation}/jiro.jsonnet (100%) rename instances/{ee4j.bean-validation => ee4j.validation}/target/Dockerfile (100%) rename instances/{ee4j.bean-validation => ee4j.validation}/target/config.json (96%) rename instances/{ee4j.bean-validation => ee4j.validation}/target/jenkins/configuration.yml (96%) rename instances/{ee4j.bean-validation => ee4j.validation}/target/jenkins/partials/permissions.hbs (95%) rename instances/{ee4j.bean-validation => ee4j.validation}/target/jenkins/plugins-list.txt (100%) rename instances/{ee4j.bean-validation => ee4j.validation}/target/jenkins/plugins.log (97%) rename instances/{ee4j.bean-validation => ee4j.validation}/target/jenkins/quicksilver.css.override (98%) create mode 100644 instances/ee4j.validation/target/jenkins/title.js rename instances/{ee4j.bean-validation => ee4j.validation}/target/k8s/configmap-jenkins-config.yml (96%) rename instances/{ee4j.bean-validation => ee4j.validation}/target/k8s/known-hosts.json (96%) rename instances/{ee4j.bean-validation => ee4j.validation}/target/k8s/limit-range.json (83%) rename instances/{ee4j.bean-validation => ee4j.validation}/target/k8s/m2-dir.json (97%) create mode 100644 instances/ee4j.validation/target/k8s/namespace.json rename instances/{ee4j.bean-validation => ee4j.validation}/target/k8s/resource-quotas.json (65%) create mode 100644 instances/ee4j.validation/target/k8s/role-binding.json rename instances/{ee4j.bean-validation => ee4j.validation}/target/k8s/role.json (80%) rename instances/{ee4j.bean-validation => ee4j.validation}/target/k8s/route.json (67%) create mode 100644 instances/ee4j.validation/target/k8s/service-account.json rename instances/{ee4j.bean-validation => ee4j.validation}/target/k8s/service-jenkins-discovery.json (57%) rename instances/{ee4j.bean-validation => ee4j.validation}/target/k8s/service-jenkins-ui.json (56%) rename instances/{ee4j.bean-validation => ee4j.validation}/target/k8s/statefulset.json (81%) rename instances/{ee4j.bean-validation => ee4j.validation}/target/k8s/tools-pv.json (72%) diff --git a/instances/ee4j.bean-validation/config.jsonnet b/instances/ee4j.bean-validation/config.jsonnet deleted file mode 100644 index 6fc73ed60..000000000 --- a/instances/ee4j.bean-validation/config.jsonnet +++ /dev/null @@ -1,6 +0,0 @@ -{ - project+: { - fullName: "ee4j.bean-validation", - displayName: "Jakarta Bean Validation" - }, -} diff --git a/instances/ee4j.bean-validation/target/jenkins/title.js b/instances/ee4j.bean-validation/target/jenkins/title.js deleted file mode 100644 index ee86c68eb..000000000 --- a/instances/ee4j.bean-validation/target/jenkins/title.js +++ /dev/null @@ -1 +0,0 @@ -document.title = "Jakarta Bean Validation - " + document.title; diff --git a/instances/ee4j.bean-validation/target/k8s/namespace.json b/instances/ee4j.bean-validation/target/k8s/namespace.json deleted file mode 100644 index 63c088caf..000000000 --- a/instances/ee4j.bean-validation/target/k8s/namespace.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "apiVersion": "v1", - "kind": "Namespace", - "metadata": { - "labels": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation", - "org.eclipse.cbi.jiro/project.shortname": "bean-validation" - }, - "name": "bean-validation" - } -} diff --git a/instances/ee4j.bean-validation/target/k8s/role-binding.json b/instances/ee4j.bean-validation/target/k8s/role-binding.json deleted file mode 100644 index e9e836913..000000000 --- a/instances/ee4j.bean-validation/target/k8s/role-binding.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "apiVersion": "rbac.authorization.k8s.io/v1", - "kind": "RoleBinding", - "metadata": { - "labels": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation", - "org.eclipse.cbi.jiro/project.shortname": "bean-validation" - }, - "name": "bean-validation", - "namespace": "bean-validation" - }, - "roleRef": { - "kind": "Role", - "name": "jenkins-master-owner", - "namespace": "bean-validation" - }, - "subjects": [ - { - "kind": "ServiceAccount", - "name": "bean-validation", - "namespace": "bean-validation" - } - ] -} diff --git a/instances/ee4j.bean-validation/target/k8s/service-account.json b/instances/ee4j.bean-validation/target/k8s/service-account.json deleted file mode 100644 index ce6711d3f..000000000 --- a/instances/ee4j.bean-validation/target/k8s/service-account.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "apiVersion": "v1", - "kind": "ServiceAccount", - "metadata": { - "labels": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation", - "org.eclipse.cbi.jiro/project.shortname": "bean-validation" - }, - "name": "bean-validation", - "namespace": "bean-validation" - } -} diff --git a/instances/ee4j.validation/config.jsonnet b/instances/ee4j.validation/config.jsonnet new file mode 100644 index 000000000..135eb2d2e --- /dev/null +++ b/instances/ee4j.validation/config.jsonnet @@ -0,0 +1,6 @@ +{ + project+: { + fullName: "ee4j.validation", + displayName: "Jakarta Validation" + }, +} diff --git a/instances/ee4j.bean-validation/jiro.jsonnet b/instances/ee4j.validation/jiro.jsonnet similarity index 100% rename from instances/ee4j.bean-validation/jiro.jsonnet rename to instances/ee4j.validation/jiro.jsonnet diff --git a/instances/ee4j.bean-validation/target/Dockerfile b/instances/ee4j.validation/target/Dockerfile similarity index 100% rename from instances/ee4j.bean-validation/target/Dockerfile rename to instances/ee4j.validation/target/Dockerfile diff --git a/instances/ee4j.bean-validation/target/config.json b/instances/ee4j.validation/target/config.json similarity index 96% rename from instances/ee4j.bean-validation/target/config.json rename to instances/ee4j.validation/target/config.json index c93147b73..c522165f8 100644 --- a/instances/ee4j.bean-validation/target/config.json +++ b/instances/ee4j.validation/target/config.json @@ -2,18 +2,18 @@ "accessControl": { "primaryGroup": { "id": -1, - "name": "ee4j.bean-validation" + "name": "ee4j.validation" }, "supplementalGroups": [ ], "user": { "id": -1, - "name": "genie.bean-validation" + "name": "genie.validation" } }, "clouds": { "kubernetes": { "kind": "kubernetes", - "namespace": "bean-validation", + "namespace": "validation", "podRetention": "never", "templates": { "basic": { @@ -408,14 +408,14 @@ "controlPort": 8081, "host": "ci.eclipse.org", "jnlpPort": 50000, - "prefix": "/bean-validation", + "prefix": "/validation", "uiPort": 8080, - "url": "https://ci.eclipse.org/bean-validation" + "url": "https://ci.eclipse.org/validation" }, "docker": { "master": { "dockerfile": "FROM docker.io/eclipsecbi/jiro-master:2.414.2\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": "ee4j.bean-validation", + "image": "ee4j.validation", "registry": "docker.io", "repository": "eclipsecbijenkins", "tag": "2.414.2" @@ -479,7 +479,7 @@ "View/Delete", "View/Read" ], - "principal": "ee4j.bean-validation" + "principal": "ee4j.validation" } ], "plugins": [ @@ -581,10 +581,10 @@ "request": "4096Mi" } }, - "namespace": "bean-validation" + "namespace": "validation" }, "master": { - "namespace": "bean-validation", + "namespace": "validation", "probe": { "liveness": { "delaySeconds": 480, @@ -609,14 +609,14 @@ "request": "1536Mi" } }, - "stsName": "bean-validation" + "stsName": "validation" } }, "maven": { "files": { "settings-security.xml": { "master": { - "pass": "bots/ee4j.bean-validation/apache-maven-security-settings" + "pass": "bots/ee4j.validation/apache-maven-security-settings" } }, "settings.xml": { @@ -631,16 +631,16 @@ "servers": { "gpg.passphrase": { "passphrase": { - "pass": "bots/ee4j.bean-validation/gpg/passphrase" + "pass": "bots/ee4j.validation/gpg/passphrase" } }, "ossrh": { "nexusProUrl": "https://jakarta.oss.sonatype.org", "password": { - "pass": "bots/ee4j.bean-validation/oss.sonatype.org/password" + "pass": "bots/ee4j.validation/oss.sonatype.org/password" }, "username": { - "pass": "bots/ee4j.bean-validation/oss.sonatype.org/username" + "pass": "bots/ee4j.validation/oss.sonatype.org/username" } }, "repo.eclipse.org": { @@ -661,11 +661,11 @@ "transferListenerLogLevel": "warn" }, "project": { - "displayName": "Jakarta Bean Validation", - "fullName": "ee4j.bean-validation", + "displayName": "Jakarta Validation", + "fullName": "ee4j.validation", "resourcePacks": 1, - "shortName": "bean-validation", - "unixGroupName": "ee4j.bean-validation" + "shortName": "validation", + "unixGroupName": "ee4j.validation" }, "sbt": { "files": { @@ -684,8 +684,8 @@ }, "secrets": { "dockerconfigjson": { - "dockerconfigjson-for-pull-as-bean-validation": { - "namespace": "bean-validation", + "dockerconfigjson-for-pull-as-default": { + "namespace": "validation", "servers": { "https://index.docker.io/v1/": { "password": { @@ -696,13 +696,13 @@ } } }, - "serviceAccount": "bean-validation", + "serviceAccount": "default", "type": [ "pull" ] }, - "dockerconfigjson-for-pull-as-default": { - "namespace": "bean-validation", + "dockerconfigjson-for-pull-as-validation": { + "namespace": "validation", "servers": { "https://index.docker.io/v1/": { "password": { @@ -713,7 +713,7 @@ } } }, - "serviceAccount": "default", + "serviceAccount": "validation", "type": [ "pull" ] diff --git a/instances/ee4j.bean-validation/target/jenkins/configuration.yml b/instances/ee4j.validation/target/jenkins/configuration.yml similarity index 96% rename from instances/ee4j.bean-validation/target/jenkins/configuration.yml rename to instances/ee4j.validation/target/jenkins/configuration.yml index f7a006693..71b43b1d9 100644 --- a/instances/ee4j.bean-validation/target/jenkins/configuration.yml +++ b/instances/ee4j.validation/target/jenkins/configuration.yml @@ -35,7 +35,7 @@ jenkins: permissions: - Job/ExtendedRead - group: - name: ee4j.bean-validation + name: ee4j.validation permissions: - Agent/Build - Credentials/View @@ -76,14 +76,14 @@ jenkins: - kubernetes: name: "kubernetes" containerCapStr: "2" - jenkinsUrl: "http://jenkins-ui.bean-validation.svc.cluster.local/bean-validation" - jenkinsTunnel: "jenkins-discovery.bean-validation.svc.cluster.local:50000" + jenkinsUrl: "http://jenkins-ui.validation.svc.cluster.local/validation" + jenkinsTunnel: "jenkins-discovery.validation.svc.cluster.local:50000" maxRequestsPerHostStr: "32" - namespace: "bean-validation" + namespace: "validation" podRetention: "never" templates: - name: "basic" - namespace: "bean-validation" + namespace: "validation" label: "basic" containers: - name: "jnlp" @@ -119,7 +119,7 @@ jenkins: value: "" volumes: - persistentVolumeClaim: - claimName: "tools-claim-jiro-bean-validation" + claimName: "tools-claim-jiro-validation" mountPath: "/opt/tools" readOnly: true - configMapVolume: @@ -169,7 +169,7 @@ jenkins: configMap: name: m2-dir - name: "basic-ubuntu" - namespace: "bean-validation" + namespace: "validation" label: "basic-ubuntu" containers: - name: "jnlp" @@ -205,7 +205,7 @@ jenkins: value: "" volumes: - persistentVolumeClaim: - claimName: "tools-claim-jiro-bean-validation" + claimName: "tools-claim-jiro-validation" mountPath: "/opt/tools" readOnly: true - configMapVolume: @@ -255,7 +255,7 @@ jenkins: configMap: name: m2-dir - name: "centos-7" - namespace: "bean-validation" + namespace: "validation" label: "migration jipp-migration centos-7" containers: - name: "jnlp" @@ -291,7 +291,7 @@ jenkins: value: "" volumes: - persistentVolumeClaim: - claimName: "tools-claim-jiro-bean-validation" + claimName: "tools-claim-jiro-validation" mountPath: "/opt/tools" readOnly: true - configMapVolume: @@ -341,7 +341,7 @@ jenkins: configMap: name: m2-dir - name: "centos-8" - namespace: "bean-validation" + namespace: "validation" label: "centos-latest centos-8" containers: - name: "jnlp" @@ -377,7 +377,7 @@ jenkins: value: "" volumes: - persistentVolumeClaim: - claimName: "tools-claim-jiro-bean-validation" + claimName: "tools-claim-jiro-validation" mountPath: "/opt/tools" readOnly: true - configMapVolume: @@ -454,7 +454,7 @@ security: unclassified: location: adminAddress: ci-admin@eclipse.org - url: https://ci.eclipse.org/bean-validation + url: https://ci.eclipse.org/validation mailer: replyToAddress: ci-admin@eclipse.org @@ -473,11 +473,11 @@ unclassified: simple-theme-plugin: elements: - cssUrl: - url: "/bean-validation/userContent/theme/quicksilver.css" + url: "/validation/userContent/theme/quicksilver.css" - cssUrl: url: "//fonts.googleapis.com/css?family=Libre+Franklin:400,700,300,600,100" - jsUrl: - url: "/bean-validation/userContent/theme/title.js" + url: "/validation/userContent/theme/title.js" buildDiscarders: configuredBuildDiscarders: @@ -505,7 +505,7 @@ unclassified: manageHooks: false hookSecretConfigs: - credentialsId: "github-webhook-secret" - hookUrl: "https://ci.eclipse.org/bean-validation/github-webhook/" + hookUrl: "https://ci.eclipse.org/validation/github-webhook/" scmGit: createAccountBasedOnEmail: true diff --git a/instances/ee4j.bean-validation/target/jenkins/partials/permissions.hbs b/instances/ee4j.validation/target/jenkins/partials/permissions.hbs similarity index 95% rename from instances/ee4j.bean-validation/target/jenkins/partials/permissions.hbs rename to instances/ee4j.validation/target/jenkins/partials/permissions.hbs index 20fbd59d5..56cf0f004 100644 --- a/instances/ee4j.bean-validation/target/jenkins/partials/permissions.hbs +++ b/instances/ee4j.validation/target/jenkins/partials/permissions.hbs @@ -12,7 +12,7 @@ permissions: - Job/ExtendedRead - group: - name: ee4j.bean-validation + name: ee4j.validation permissions: - Agent/Build - Credentials/View diff --git a/instances/ee4j.bean-validation/target/jenkins/plugins-list.txt b/instances/ee4j.validation/target/jenkins/plugins-list.txt similarity index 100% rename from instances/ee4j.bean-validation/target/jenkins/plugins-list.txt rename to instances/ee4j.validation/target/jenkins/plugins-list.txt diff --git a/instances/ee4j.bean-validation/target/jenkins/plugins.log b/instances/ee4j.validation/target/jenkins/plugins.log similarity index 97% rename from instances/ee4j.bean-validation/target/jenkins/plugins.log rename to instances/ee4j.validation/target/jenkins/plugins.log index 54c851626..1b701af4b 100644 --- a/instances/ee4j.bean-validation/target/jenkins/plugins.log +++ b/instances/ee4j.validation/target/jenkins/plugins.log @@ -23,7 +23,7 @@ data-tables-api 1.13.6-4 display-url-api 2.3.9 durable-task 523.va_a_22cf15d5e0 echarts-api 5.4.0-6 -email-ext 2.101 +email-ext 2.102 extended-read-permission 53.v6499940139e5 external-monitor-job 215.v2e88e894db_f8 extra-columns 1.26 @@ -34,7 +34,7 @@ git 5.2.0 git-client 4.5.0 git-parameter 0.9.19 github 1.37.3 -github-api 1.314-431.v78d72a_3fe4c3 +github-api 1.316-451.v15738eef3414 github-branch-source 1741.va_3028eb_9fd21 gitlab-api 5.3.0-91.v1f9a_fda_d654f gitlab-branch-source 677.v0b_63b_038322b_ @@ -94,7 +94,7 @@ scm-api 676.v886669a_199a_a_ script-security 1275.v23895f409fb_d simple-theme-plugin 160.vb_76454b_67900 snakeyaml-api 2.2-111.vc6598e30cc65 -sonar 2.15 +sonar 2.16 ssh-agent 333.v878b_53c89511 ssh-credentials 308.ve4497b_ccd8f4 ssh-slaves 2.916.vd17b_43357ce4 @@ -109,7 +109,7 @@ workflow-api 1281.vca_5fddb_3fceb_ workflow-basic-steps 1042.ve7b_140c4a_e0c workflow-cps 3793.v65dec41c3a_c3 workflow-durable-task-step 1289.v4d3e7b_01546b_ -workflow-job 1346.v180a_63f40267 +workflow-job 1348.v32a_a_f150910e workflow-multibranch 756.v891d88f2cd46 workflow-scm-step 415.v434365564324 workflow-step-api 639.v6eca_cd8c04a_a_ diff --git a/instances/ee4j.bean-validation/target/jenkins/quicksilver.css.override b/instances/ee4j.validation/target/jenkins/quicksilver.css.override similarity index 98% rename from instances/ee4j.bean-validation/target/jenkins/quicksilver.css.override rename to instances/ee4j.validation/target/jenkins/quicksilver.css.override index 2bf6c3f25..33d0245a0 100644 --- a/instances/ee4j.bean-validation/target/jenkins/quicksilver.css.override +++ b/instances/ee4j.validation/target/jenkins/quicksilver.css.override @@ -32,7 +32,7 @@ IMG.page-header__brand-image { } .page-header__brand-name:after { - content: 'Jakarta Bean Validation'; + content: 'Jakarta Validation'; visibility: visible; font-size: 18px; line-height: 24px; diff --git a/instances/ee4j.validation/target/jenkins/title.js b/instances/ee4j.validation/target/jenkins/title.js new file mode 100644 index 000000000..e9c241643 --- /dev/null +++ b/instances/ee4j.validation/target/jenkins/title.js @@ -0,0 +1 @@ +document.title = "Jakarta Validation - " + document.title; diff --git a/instances/ee4j.bean-validation/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.validation/target/k8s/configmap-jenkins-config.yml similarity index 96% rename from instances/ee4j.bean-validation/target/k8s/configmap-jenkins-config.yml rename to instances/ee4j.validation/target/k8s/configmap-jenkins-config.yml index 8ecb61c5d..2e4290e2c 100644 --- a/instances/ee4j.bean-validation/target/k8s/configmap-jenkins-config.yml +++ b/instances/ee4j.validation/target/k8s/configmap-jenkins-config.yml @@ -10,14 +10,14 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - org.eclipse.cbi.jiro/project.shortname: "bean-validation" - org.eclipse.cbi.jiro/project.fullName: "ee4j.bean-validation" + org.eclipse.cbi.jiro/project.shortname: "validation" + org.eclipse.cbi.jiro/project.fullName: "ee4j.validation" org.eclipse.cbi.jiro/kind: "master" annotations: org.eclipse.cbi.jiro/jenkins.version: "latest" org.eclipse.cbi.jiro/jenkins.actualVersion: "2.414.2" - org.eclipse.cbi.jiro/kubernetes.master.namespace: "bean-validation" - namespace: "bean-validation" + org.eclipse.cbi.jiro/kubernetes.master.namespace: "validation" + namespace: "validation" name: jenkins-config data: jenkins.yaml: | @@ -58,7 +58,7 @@ data: permissions: - Job/ExtendedRead - group: - name: ee4j.bean-validation + name: ee4j.validation permissions: - Agent/Build - Credentials/View @@ -99,14 +99,14 @@ data: - kubernetes: name: "kubernetes" containerCapStr: "2" - jenkinsUrl: "http://jenkins-ui.bean-validation.svc.cluster.local/bean-validation" - jenkinsTunnel: "jenkins-discovery.bean-validation.svc.cluster.local:50000" + jenkinsUrl: "http://jenkins-ui.validation.svc.cluster.local/validation" + jenkinsTunnel: "jenkins-discovery.validation.svc.cluster.local:50000" maxRequestsPerHostStr: "32" - namespace: "bean-validation" + namespace: "validation" podRetention: "never" templates: - name: "basic" - namespace: "bean-validation" + namespace: "validation" label: "basic" containers: - name: "jnlp" @@ -142,7 +142,7 @@ data: value: "" volumes: - persistentVolumeClaim: - claimName: "tools-claim-jiro-bean-validation" + claimName: "tools-claim-jiro-validation" mountPath: "/opt/tools" readOnly: true - configMapVolume: @@ -192,7 +192,7 @@ data: configMap: name: m2-dir - name: "basic-ubuntu" - namespace: "bean-validation" + namespace: "validation" label: "basic-ubuntu" containers: - name: "jnlp" @@ -228,7 +228,7 @@ data: value: "" volumes: - persistentVolumeClaim: - claimName: "tools-claim-jiro-bean-validation" + claimName: "tools-claim-jiro-validation" mountPath: "/opt/tools" readOnly: true - configMapVolume: @@ -278,7 +278,7 @@ data: configMap: name: m2-dir - name: "centos-7" - namespace: "bean-validation" + namespace: "validation" label: "migration jipp-migration centos-7" containers: - name: "jnlp" @@ -314,7 +314,7 @@ data: value: "" volumes: - persistentVolumeClaim: - claimName: "tools-claim-jiro-bean-validation" + claimName: "tools-claim-jiro-validation" mountPath: "/opt/tools" readOnly: true - configMapVolume: @@ -364,7 +364,7 @@ data: configMap: name: m2-dir - name: "centos-8" - namespace: "bean-validation" + namespace: "validation" label: "centos-latest centos-8" containers: - name: "jnlp" @@ -400,7 +400,7 @@ data: value: "" volumes: - persistentVolumeClaim: - claimName: "tools-claim-jiro-bean-validation" + claimName: "tools-claim-jiro-validation" mountPath: "/opt/tools" readOnly: true - configMapVolume: @@ -477,7 +477,7 @@ data: unclassified: location: adminAddress: ci-admin@eclipse.org - url: https://ci.eclipse.org/bean-validation + url: https://ci.eclipse.org/validation mailer: replyToAddress: ci-admin@eclipse.org @@ -496,11 +496,11 @@ data: simple-theme-plugin: elements: - cssUrl: - url: "/bean-validation/userContent/theme/quicksilver.css" + url: "/validation/userContent/theme/quicksilver.css" - cssUrl: url: "//fonts.googleapis.com/css?family=Libre+Franklin:400,700,300,600,100" - jsUrl: - url: "/bean-validation/userContent/theme/title.js" + url: "/validation/userContent/theme/title.js" buildDiscarders: configuredBuildDiscarders: @@ -528,7 +528,7 @@ data: manageHooks: false hookSecretConfigs: - credentialsId: "github-webhook-secret" - hookUrl: "https://ci.eclipse.org/bean-validation/github-webhook/" + hookUrl: "https://ci.eclipse.org/validation/github-webhook/" scmGit: createAccountBasedOnEmail: true diff --git a/instances/ee4j.bean-validation/target/k8s/known-hosts.json b/instances/ee4j.validation/target/k8s/known-hosts.json similarity index 96% rename from instances/ee4j.bean-validation/target/k8s/known-hosts.json rename to instances/ee4j.validation/target/k8s/known-hosts.json index b6c0bb153..f8b7ac70f 100644 --- a/instances/ee4j.bean-validation/target/k8s/known-hosts.json +++ b/instances/ee4j.validation/target/k8s/known-hosts.json @@ -6,10 +6,10 @@ "kind": "ConfigMap", "metadata": { "labels": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation", - "org.eclipse.cbi.jiro/project.shortname": "bean-validation" + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation", + "org.eclipse.cbi.jiro/project.shortname": "validation" }, "name": "known-hosts", - "namespace": "bean-validation" + "namespace": "validation" } } diff --git a/instances/ee4j.bean-validation/target/k8s/limit-range.json b/instances/ee4j.validation/target/k8s/limit-range.json similarity index 83% rename from instances/ee4j.bean-validation/target/k8s/limit-range.json rename to instances/ee4j.validation/target/k8s/limit-range.json index a89137d75..a16a9d335 100644 --- a/instances/ee4j.bean-validation/target/k8s/limit-range.json +++ b/instances/ee4j.validation/target/k8s/limit-range.json @@ -3,11 +3,11 @@ "kind": "LimitRange", "metadata": { "labels": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation", - "org.eclipse.cbi.jiro/project.shortname": "bean-validation" + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation", + "org.eclipse.cbi.jiro/project.shortname": "validation" }, "name": "jenkins-instance-limit-range", - "namespace": "bean-validation" + "namespace": "validation" }, "spec": { "limits": [ diff --git a/instances/ee4j.bean-validation/target/k8s/m2-dir.json b/instances/ee4j.validation/target/k8s/m2-dir.json similarity index 97% rename from instances/ee4j.bean-validation/target/k8s/m2-dir.json rename to instances/ee4j.validation/target/k8s/m2-dir.json index b3fc14c8f..47ebf18ed 100644 --- a/instances/ee4j.bean-validation/target/k8s/m2-dir.json +++ b/instances/ee4j.validation/target/k8s/m2-dir.json @@ -7,10 +7,10 @@ "kind": "ConfigMap", "metadata": { "labels": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation", - "org.eclipse.cbi.jiro/project.shortname": "bean-validation" + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation", + "org.eclipse.cbi.jiro/project.shortname": "validation" }, "name": "m2-dir", - "namespace": "bean-validation" + "namespace": "validation" } } diff --git a/instances/ee4j.validation/target/k8s/namespace.json b/instances/ee4j.validation/target/k8s/namespace.json new file mode 100644 index 000000000..28e5137c3 --- /dev/null +++ b/instances/ee4j.validation/target/k8s/namespace.json @@ -0,0 +1,11 @@ +{ + "apiVersion": "v1", + "kind": "Namespace", + "metadata": { + "labels": { + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation", + "org.eclipse.cbi.jiro/project.shortname": "validation" + }, + "name": "validation" + } +} diff --git a/instances/ee4j.bean-validation/target/k8s/resource-quotas.json b/instances/ee4j.validation/target/k8s/resource-quotas.json similarity index 65% rename from instances/ee4j.bean-validation/target/k8s/resource-quotas.json rename to instances/ee4j.validation/target/k8s/resource-quotas.json index 24d1430ba..399403fef 100644 --- a/instances/ee4j.bean-validation/target/k8s/resource-quotas.json +++ b/instances/ee4j.validation/target/k8s/resource-quotas.json @@ -3,11 +3,11 @@ "kind": "ResourceQuota", "metadata": { "labels": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation", - "org.eclipse.cbi.jiro/project.shortname": "bean-validation" + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation", + "org.eclipse.cbi.jiro/project.shortname": "validation" }, "name": "jenkins-instance-quota", - "namespace": "bean-validation" + "namespace": "validation" }, "spec": { "hard": { diff --git a/instances/ee4j.validation/target/k8s/role-binding.json b/instances/ee4j.validation/target/k8s/role-binding.json new file mode 100644 index 000000000..fbc54387b --- /dev/null +++ b/instances/ee4j.validation/target/k8s/role-binding.json @@ -0,0 +1,24 @@ +{ + "apiVersion": "rbac.authorization.k8s.io/v1", + "kind": "RoleBinding", + "metadata": { + "labels": { + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation", + "org.eclipse.cbi.jiro/project.shortname": "validation" + }, + "name": "validation", + "namespace": "validation" + }, + "roleRef": { + "kind": "Role", + "name": "jenkins-master-owner", + "namespace": "validation" + }, + "subjects": [ + { + "kind": "ServiceAccount", + "name": "validation", + "namespace": "validation" + } + ] +} diff --git a/instances/ee4j.bean-validation/target/k8s/role.json b/instances/ee4j.validation/target/k8s/role.json similarity index 80% rename from instances/ee4j.bean-validation/target/k8s/role.json rename to instances/ee4j.validation/target/k8s/role.json index be44f987a..6fae55690 100644 --- a/instances/ee4j.bean-validation/target/k8s/role.json +++ b/instances/ee4j.validation/target/k8s/role.json @@ -3,11 +3,11 @@ "kind": "Role", "metadata": { "labels": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation", - "org.eclipse.cbi.jiro/project.shortname": "bean-validation" + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation", + "org.eclipse.cbi.jiro/project.shortname": "validation" }, "name": "jenkins-master-owner", - "namespace": "bean-validation" + "namespace": "validation" }, "rules": [ { diff --git a/instances/ee4j.bean-validation/target/k8s/route.json b/instances/ee4j.validation/target/k8s/route.json similarity index 67% rename from instances/ee4j.bean-validation/target/k8s/route.json rename to instances/ee4j.validation/target/k8s/route.json index 6b5cb8162..e305fbd5c 100644 --- a/instances/ee4j.bean-validation/target/k8s/route.json +++ b/instances/ee4j.validation/target/k8s/route.json @@ -6,15 +6,15 @@ "haproxy.router.openshift.io/timeout": "60s" }, "labels": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation", - "org.eclipse.cbi.jiro/project.shortname": "bean-validation" + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation", + "org.eclipse.cbi.jiro/project.shortname": "validation" }, - "name": "bean-validation", - "namespace": "bean-validation" + "name": "validation", + "namespace": "validation" }, "spec": { "host": "ci.eclipse.org", - "path": "/bean-validation", + "path": "/validation", "port": { "targetPort": "http" }, diff --git a/instances/ee4j.validation/target/k8s/service-account.json b/instances/ee4j.validation/target/k8s/service-account.json new file mode 100644 index 000000000..86e9aae50 --- /dev/null +++ b/instances/ee4j.validation/target/k8s/service-account.json @@ -0,0 +1,12 @@ +{ + "apiVersion": "v1", + "kind": "ServiceAccount", + "metadata": { + "labels": { + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation", + "org.eclipse.cbi.jiro/project.shortname": "validation" + }, + "name": "validation", + "namespace": "validation" + } +} diff --git a/instances/ee4j.bean-validation/target/k8s/service-jenkins-discovery.json b/instances/ee4j.validation/target/k8s/service-jenkins-discovery.json similarity index 57% rename from instances/ee4j.bean-validation/target/k8s/service-jenkins-discovery.json rename to instances/ee4j.validation/target/k8s/service-jenkins-discovery.json index 434876623..1c0989a46 100644 --- a/instances/ee4j.bean-validation/target/k8s/service-jenkins-discovery.json +++ b/instances/ee4j.validation/target/k8s/service-jenkins-discovery.json @@ -3,11 +3,11 @@ "kind": "Service", "metadata": { "labels": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation", - "org.eclipse.cbi.jiro/project.shortname": "bean-validation" + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation", + "org.eclipse.cbi.jiro/project.shortname": "validation" }, "name": "jenkins-discovery", - "namespace": "bean-validation" + "namespace": "validation" }, "spec": { "ports": [ @@ -19,7 +19,7 @@ } ], "selector": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation" + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation" } } } diff --git a/instances/ee4j.bean-validation/target/k8s/service-jenkins-ui.json b/instances/ee4j.validation/target/k8s/service-jenkins-ui.json similarity index 56% rename from instances/ee4j.bean-validation/target/k8s/service-jenkins-ui.json rename to instances/ee4j.validation/target/k8s/service-jenkins-ui.json index 79edf251c..758ee64dd 100644 --- a/instances/ee4j.bean-validation/target/k8s/service-jenkins-ui.json +++ b/instances/ee4j.validation/target/k8s/service-jenkins-ui.json @@ -3,11 +3,11 @@ "kind": "Service", "metadata": { "labels": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation", - "org.eclipse.cbi.jiro/project.shortname": "bean-validation" + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation", + "org.eclipse.cbi.jiro/project.shortname": "validation" }, "name": "jenkins-ui", - "namespace": "bean-validation" + "namespace": "validation" }, "spec": { "ports": [ @@ -19,7 +19,7 @@ } ], "selector": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation" + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation" } } } diff --git a/instances/ee4j.bean-validation/target/k8s/statefulset.json b/instances/ee4j.validation/target/k8s/statefulset.json similarity index 81% rename from instances/ee4j.bean-validation/target/k8s/statefulset.json rename to instances/ee4j.validation/target/k8s/statefulset.json index 5b3fee114..5e6212e69 100644 --- a/instances/ee4j.bean-validation/target/k8s/statefulset.json +++ b/instances/ee4j.validation/target/k8s/statefulset.json @@ -3,27 +3,27 @@ "kind": "StatefulSet", "metadata": { "labels": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation", - "org.eclipse.cbi.jiro/project.shortname": "bean-validation" + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation", + "org.eclipse.cbi.jiro/project.shortname": "validation" }, - "name": "bean-validation", - "namespace": "bean-validation" + "name": "validation", + "namespace": "validation" }, "spec": { "replicas": 1, "selector": { "matchLabels": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation" + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation" } }, - "serviceName": "bean-validation", + "serviceName": "validation", "template": { "metadata": { "labels": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation", - "org.eclipse.cbi.jiro/project.shortname": "bean-validation" + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation", + "org.eclipse.cbi.jiro/project.shortname": "validation" }, - "name": "bean-validation" + "name": "validation" }, "spec": { "affinity": { @@ -51,11 +51,11 @@ "env": [ { "name": "JAVA_OPTS", - "value": "-showversion -XshowSettings:vm -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -XX:+DisableExplicitGC -Duser.timezone=America/Toronto -Dhudson.footerURL=https://ci.eclipse.org -Dhudson.model.UsageStatistics.disabled=true -Dhudson.lifecycle=hudson.lifecycle.ExitLifecycle -Djenkins.model.Jenkins.exitCodeOnRestart=0 -Djenkins.model.Jenkins.slaveAgentPort=50000 -Djenkins.model.Jenkins.slaveAgentPortEnforce=true -Djenkins.slaves.JnlpSlaveAgentProtocol3.enabled=false -Djenkins.install.runSetupWizard=false -Djenkins.ui.refresh=true -Djenkins.security.ManagePermission=true -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.HEARTBEAT_CHECK_INTERVAL=7200 -DexecutableWar.jetty.disableCustomSessionIdCookieName=false -DexecutableWar.jetty.sessionIdCookieName=JSESSIONID.bean-validation -Dcasc.jenkins.config=/etc/jenkins/jenkins.yaml -Dio.jenkins.plugins.casc.ConfigurationAsCode.initialDelay=5000 -Dorg.csanchez.jenkins.plugins.kubernetes.pipeline.PodTemplateStepExecution.defaultImage=docker.io/eclipsecbi/jiro-agent-basic:remoting-3131.vf2b_b_798b_ce99 -Dorg.csanchez.jenkins.plugins.kubernetes.PodTemplate.connectionTimeout=180 -Dkubernetes.websocket.ping.interval=30000" + "value": "-showversion -XshowSettings:vm -XX:+AlwaysPreTouch -XX:+ParallelRefProcEnabled -XX:+DisableExplicitGC -Duser.timezone=America/Toronto -Dhudson.footerURL=https://ci.eclipse.org -Dhudson.model.UsageStatistics.disabled=true -Dhudson.lifecycle=hudson.lifecycle.ExitLifecycle -Djenkins.model.Jenkins.exitCodeOnRestart=0 -Djenkins.model.Jenkins.slaveAgentPort=50000 -Djenkins.model.Jenkins.slaveAgentPortEnforce=true -Djenkins.slaves.JnlpSlaveAgentProtocol3.enabled=false -Djenkins.install.runSetupWizard=false -Djenkins.ui.refresh=true -Djenkins.security.ManagePermission=true -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.HEARTBEAT_CHECK_INTERVAL=7200 -DexecutableWar.jetty.disableCustomSessionIdCookieName=false -DexecutableWar.jetty.sessionIdCookieName=JSESSIONID.validation -Dcasc.jenkins.config=/etc/jenkins/jenkins.yaml -Dio.jenkins.plugins.casc.ConfigurationAsCode.initialDelay=5000 -Dorg.csanchez.jenkins.plugins.kubernetes.pipeline.PodTemplateStepExecution.defaultImage=docker.io/eclipsecbi/jiro-agent-basic:remoting-3131.vf2b_b_798b_ce99 -Dorg.csanchez.jenkins.plugins.kubernetes.PodTemplate.connectionTimeout=180 -Dkubernetes.websocket.ping.interval=30000" }, { "name": "JENKINS_OPTS", - "value": "--prefix=/bean-validation --webroot=/var/cache/jenkins/war --pluginroot=/var/cache/jenkins/plugins --controlPort=8081" + "value": "--prefix=/validation --webroot=/var/cache/jenkins/war --pluginroot=/var/cache/jenkins/plugins --controlPort=8081" }, { "name": "PLUGINS_FORCE_UPGRADE", @@ -66,7 +66,7 @@ "value": "true" } ], - "image": "docker.io/eclipsecbijenkins/ee4j.bean-validation:2.414.2", + "image": "docker.io/eclipsecbijenkins/ee4j.validation:2.414.2", "imagePullPolicy": "Always", "lifecycle": { "preStop": { @@ -82,7 +82,7 @@ "livenessProbe": { "failureThreshold": 5, "httpGet": { - "path": "/bean-validation/login", + "path": "/validation/login", "port": 8080, "scheme": "HTTP" }, @@ -140,7 +140,7 @@ ] } ], - "serviceAccountName": "bean-validation", + "serviceAccountName": "validation", "terminationGracePeriodSeconds": 1200, "volumes": [ { diff --git a/instances/ee4j.bean-validation/target/k8s/tools-pv.json b/instances/ee4j.validation/target/k8s/tools-pv.json similarity index 72% rename from instances/ee4j.bean-validation/target/k8s/tools-pv.json rename to instances/ee4j.validation/target/k8s/tools-pv.json index 9ee1e7f80..797ba4933 100644 --- a/instances/ee4j.bean-validation/target/k8s/tools-pv.json +++ b/instances/ee4j.validation/target/k8s/tools-pv.json @@ -6,10 +6,10 @@ "kind": "PersistentVolume", "metadata": { "labels": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation", - "org.eclipse.cbi.jiro/project.shortname": "bean-validation" + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation", + "org.eclipse.cbi.jiro/project.shortname": "validation" }, - "name": "tools-jiro-bean-validation" + "name": "tools-jiro-validation" }, "spec": { "accessModes": [ @@ -19,8 +19,8 @@ "storage": "20Gi" }, "claimRef": { - "name": "tools-claim-jiro-bean-validation", - "namespace": "bean-validation" + "name": "tools-claim-jiro-validation", + "namespace": "validation" }, "mountOptions": [ "vers=4.2", @@ -50,11 +50,11 @@ "kind": "PersistentVolumeClaim", "metadata": { "labels": { - "org.eclipse.cbi.jiro/project.fullName": "ee4j.bean-validation", - "org.eclipse.cbi.jiro/project.shortname": "bean-validation" + "org.eclipse.cbi.jiro/project.fullName": "ee4j.validation", + "org.eclipse.cbi.jiro/project.shortname": "validation" }, - "name": "tools-claim-jiro-bean-validation", - "namespace": "bean-validation" + "name": "tools-claim-jiro-validation", + "namespace": "validation" }, "spec": { "accessModes": [