diff --git a/instances/automotive.openpass/jenkins/configuration.yml b/instances/automotive.openpass/jenkins/configuration.yml index 87cfc5ffa..19846e73d 100644 --- a/instances/automotive.openpass/jenkins/configuration.yml +++ b/instances/automotive.openpass/jenkins/configuration.yml @@ -103,3 +103,25 @@ unclassified: name: "gitlab.eclipse.org" serverUrl: "https://gitlab.eclipse.org" webhookSecretCredentialsId: "gitlab-webhook-secret" + globalLibraries: + libraries: + - name: "releng-pipeline" + defaultVersion: "main" + retriever: + modernSCM: + scm: + gitlab: + credentialsId: "gitlab-bot-ssh" + id: "75d03fa0-fb63-4565-89e2-b3247ea349e3" + projectOwner: "eclipsefdn/it/releng/jenkins-pipeline-service" + projectPath: "eclipsefdn/it/releng/jenkins-pipeline-service/jenkins-pipeline-library" + serverName: "gitlab.eclipse.org" + traits: + - gitLabBranchDiscovery: + strategyId: 1 + - gitLabOriginDiscovery: + strategyId: 2 + - gitLabForkDiscovery: + buildMRForksNotMirror: false + strategyId: 2 + trust: "gitLabTrustPermissions" diff --git a/instances/automotive.openpass/target/config.json b/instances/automotive.openpass/target/config.json index 38ee9546b..f4436ecbb 100644 --- a/instances/automotive.openpass/target/config.json +++ b/instances/automotive.openpass/target/config.json @@ -508,7 +508,7 @@ "repository": "eclipsecbi", "tag": "2.426.3" }, - "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 eclipsecbi/semeru-ubuntu-coreutils:openjdk11-jammy\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/var/jenkins\"\n\n# jenkins version being bundled in this docker image\nENV JENKINS_HOME=\"/var/jenkins\"\nENV JENKINS_WAR=\"/usr/share/jenkins/jenkins.war\"\nENV COPY_REFERENCE_FILE_LOG=\"/var/jenkins/copy_reference_file.log\"\nENV REF=\"/usr/share/jenkins/ref\"\n\nVOLUME [ \"/var/jenkins\", \"/var/cache/jenkins/war\", \"/var/cache/jenkins/plugins\" ]\nWORKDIR \"/var/jenkins\"\n\nENTRYPOINT [\"uid_entrypoint\", \"/usr/bin/dumb-init\", \"--\", \"/usr/local/bin/jenkins.sh\"]\n\nRUN mkdir -p $(dirname \"/usr/share/jenkins/jenkins.war\") && mkdir -p \"/usr/share/jenkins/ref\"\n\nCOPY scripts/* /usr/local/bin/\nRUN chmod ug+x /usr/local/bin/*\n\nCOPY war/jenkins.war \"/usr/share/jenkins/jenkins.war\"\nCOPY ref/ \"/usr/share/jenkins/ref/\"\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 eclipsecbi/semeru-ubuntu-coreutils:openjdk11-jammy\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/var/jenkins\"\n\n# jenkins version being bundled in this docker image\nENV JENKINS_HOME=\"/var/jenkins\"\nENV JENKINS_WAR=\"/usr/share/jenkins/jenkins.war\"\nENV COPY_REFERENCE_FILE_LOG=\"/var/jenkins/copy_reference_file.log\"\nENV REF=\"/usr/share/jenkins/ref\"\n\nVOLUME [ \"/var/jenkins\", \"/var/cache/jenkins/war\", \"/var/cache/jenkins/plugins\" ]\nWORKDIR \"/var/jenkins\"\n\nENTRYPOINT [\"/usr/bin/dumb-init\", \"--\", \"/usr/local/bin/jenkins.sh\"]\n\nRUN mkdir -p $(dirname \"/usr/share/jenkins/jenkins.war\") && mkdir -p \"/usr/share/jenkins/ref\"\n\nCOPY scripts/* /usr/local/bin/\nRUN chmod ug+x /usr/local/bin/*\n\nCOPY war/jenkins.war \"/usr/share/jenkins/jenkins.war\"\nCOPY ref/ \"/usr/share/jenkins/ref/\"\n", "home": "/var/jenkins", "id": "2.426.3", "key_fingerprint": "5BA31D57EF5975CA", @@ -550,6 +550,7 @@ "parameterized-trigger", "pipeline-maven", "pipeline-stage-view", + "prometheus", "promoted-builds", "rebuild", "simple-theme-plugin", diff --git a/instances/automotive.openpass/target/jenkins/configuration.yml b/instances/automotive.openpass/target/jenkins/configuration.yml index 22cae11cf..5c5f66f7f 100644 --- a/instances/automotive.openpass/target/jenkins/configuration.yml +++ b/instances/automotive.openpass/target/jenkins/configuration.yml @@ -567,6 +567,35 @@ unclassified: showBuildBadges: "never" showChangeReasonCommentWindow: false skipDuplicateHistory: true + prometheusConfiguration: + appendParamLabel: false + appendStatusLabel: false + collectCodeCoverage: false + collectDiskUsage: true + collectNodeStatus: true + collectingMetricsPeriodInSeconds: 120 + countAbortedBuilds: true + countFailedBuilds: true + countNotBuiltBuilds: true + countSuccessfulBuilds: true + countUnstableBuilds: true + defaultNamespace: "" + disabledMetricConfig: + entries: + - regexDisabledMetric: + regex: "jenkins_builds_last_stage_duration.*" + - regexDisabledMetric: + regex: "jvm_.*" + - regexDisabledMetric: + regex: "vm_memory.*" + - regexDisabledMetric: + regex: "jenkins_builds_discard_active.*" + fetchTestResults: true + jobAttributeName: "jenkins_job" + path: "prometheus" + perBuildMetrics: false + processingDisabledBuilds: false + useAuthenticatedEndpoint: false gitLabConnectionConfig: connections: - apiTokenId: "gitlab-api-token" @@ -582,6 +611,28 @@ unclassified: name: "gitlab.eclipse.org" serverUrl: "https://gitlab.eclipse.org" webhookSecretCredentialsId: "gitlab-webhook-secret" + globalLibraries: + libraries: + - name: "releng-pipeline" + defaultVersion: "main" + retriever: + modernSCM: + scm: + gitlab: + credentialsId: "gitlab-bot-ssh" + id: "75d03fa0-fb63-4565-89e2-b3247ea349e3" + projectOwner: "eclipsefdn/it/releng/jenkins-pipeline-service" + projectPath: "eclipsefdn/it/releng/jenkins-pipeline-service/jenkins-pipeline-library" + serverName: "gitlab.eclipse.org" + traits: + - gitLabBranchDiscovery: + strategyId: 1 + - gitLabOriginDiscovery: + strategyId: 2 + - gitLabForkDiscovery: + buildMRForksNotMirror: false + strategyId: 2 + trust: "gitLabTrustPermissions" tool: jdk: installations: diff --git a/instances/automotive.openpass/target/jenkins/plugins.log b/instances/automotive.openpass/target/jenkins/plugins.log index 2b6a3c8e0..a26442f9c 100644 --- a/instances/automotive.openpass/target/jenkins/plugins.log +++ b/instances/automotive.openpass/target/jenkins/plugins.log @@ -3,6 +3,7 @@ analysis-model-api 12.1.0 ant 497.v94e7d9fffa_b_9 antisamy-markup-formatter 162.v0e6ec0fcfcf6 apache-httpcomponents-client-4-api 4.5.14-208.v438351942757 +asm-api 9.7-33.v4d23ef79fcc8 authentication-tokens 1.53.v1c90fd9191a_b_ authorize-project 1.7.1 bootstrap5-api 5.3.3-1 @@ -10,19 +11,19 @@ bouncycastle-api 2.30.1.77-225.v26ea_c9455fd9 branch-api 2.1152.v6f101e97dd77 build-timeout 1.32 caffeine-api 3.1.8-133.v17b_1ff2e0599 -checks-api 2.0.2 +checks-api 2.2.0 cloudbees-folder 6.858.v898218f3609d command-launcher 107.v773860566e2e commons-lang3-api 3.13.0-62.v7d18e55f51e2 -commons-text-api 1.11.0-95.v22a_d30ee5d36 +commons-text-api 1.11.0-109.vfe16c66636eb_ conditional-buildstep 1.4.3 -config-file-provider 968.ve1ca_eb_913f8c +config-file-provider 973.vb_a_80ecb_9a_4d0 configuration-as-code 1775.v810dc950b_514 credentials 1337.v60b_d7b_c7b_c9f credentials-binding 657.v2b_19db_7d6e6d -data-tables-api 1.13.8-4 +data-tables-api 2.0.3-1 display-url-api 2.200.vb_9327d658781 -durable-task 550.v0930093c4b_a_6 +durable-task 555.v6802fe0f0b_82 echarts-api 5.5.0-1 email-ext 2.105 extended-read-permission 53.v6499940139e5 @@ -32,46 +33,46 @@ font-awesome-api 6.5.1-3 forensics-api 2.4.0 ghprb 1.42.2 git 5.2.1 -git-client 4.6.0 +git-client 4.7.0 git-parameter 0.9.19 github 1.38.0 github-api 1.318-461.v7a_c09c9fa_d63 -github-branch-source 1772.va_69eda_d018d4 +github-branch-source 1787.v8b_8cd49a_f8f1 gitlab-api 5.3.0-91.v1f9a_fda_d654f gitlab-branch-source 703.vc5fd7effcc6b_ gitlab-plugin 1.8.0 gson-api 2.10.1-15.v0d99f670e0a_7 handy-uri-templates-2-api 2.1.8-30.v7e777411b_148 instance-identity 185.v303dc7c645f9 -ionicons-api 56.v1b_1c8c49374e -jackson2-api 2.16.1-373.ve709c6871598 +ionicons-api 70.v2959a_b_74e3cf +jackson2-api 2.17.0-379.v02de8ec9f64c jakarta-activation-api 2.1.3-1 jakarta-mail-api 2.1.3-1 javadoc 243.vb_b_503b_b_45537 javax-activation-api 1.2.0-6 jaxb 2.3.9-1 jdk-tool 73.vddf737284550 -jersey2-api 2.41-133.va_03323b_a_1396 -jjwt-api 0.11.5-77.v646c772fddb_0 +jersey2-api 2.42-147.va_28a_44603b_d5 +jjwt-api 0.11.5-112.ve82dfb_224b_a_d jobConfigHistory 1229.v3039470161a_d joda-time-api 2.12.7-29.v5a_b_e3a_82269a_ jquery3-api 3.7.1-2 jsch 0.2.16-86.v42e010d9484b_ -json-api 20240205-27.va_007549e895c -json-path-api 2.9.0-33.v2527142f2e1d -junit 1259.v65ffcef24a_88 -kubernetes 4193.vded98e56cc25 +json-api 20240303-41.v94e11e6de726 +json-path-api 2.9.0-58.v62e3e85b_a_655 +junit 1265.v65b_14fa_f12f0 +kubernetes 4203.v1dd44f5b_1cf9 kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2 kubernetes-credentials 0.11 -ldap 711.vb_d1a_491714dc +ldap 719.vcb_d039b_77d0d mail-watcher-plugin 1.19 mailer 470.vc91f60c5d8e2 -matrix-auth 3.2.1 +matrix-auth 3.2.2 matrix-project 822.824.v14451b_c0fd42 maven-plugin 3.23 metrics 4.2.21-449.v6960d7c54c69 -mina-sshd-api-common 2.12.0-90.v9f7fb_9fa_3d3b_ -mina-sshd-api-core 2.12.0-90.v9f7fb_9fa_3d3b_ +mina-sshd-api-common 2.12.1-101.v85b_e08b_780dd +mina-sshd-api-core 2.12.1-101.v85b_e08b_780dd nodejs 1.6.1 okhttp-api 4.11.0-172.vda_da_1feeb_c6e pam-auth 1.10 @@ -80,47 +81,48 @@ pipeline-build-step 540.vb_e8849e1a_b_d8 pipeline-graph-analysis 216.vfd8b_ece330ca_ pipeline-groovy-lib 704.vc58b_8890a_384 pipeline-input-step 477.v339683a_8d55e -pipeline-maven 1381.v08b_63fa_30559 -pipeline-maven-api 1381.v08b_63fa_30559 -pipeline-milestone-step 111.v449306f708b_7 -pipeline-model-api 2.2175.v76a_fff0a_2618 -pipeline-model-definition 2.2175.v76a_fff0a_2618 -pipeline-model-extensions 2.2175.v76a_fff0a_2618 +pipeline-maven 1396.veb_f07b_2fc1d8 +pipeline-maven-api 1396.veb_f07b_2fc1d8 +pipeline-milestone-step 119.vdfdc43fc3b_9a_ +pipeline-model-api 2.2198.v41dd8ef6dd56 +pipeline-model-definition 2.2198.v41dd8ef6dd56 +pipeline-model-extensions 2.2198.v41dd8ef6dd56 pipeline-rest-api 2.34 -pipeline-stage-step 305.ve96d0205c1c6 -pipeline-stage-tags-metadata 2.2175.v76a_fff0a_2618 +pipeline-stage-step 312.v8cd10304c27a_ +pipeline-stage-tags-metadata 2.2198.v41dd8ef6dd56 pipeline-stage-view 2.34 plain-credentials 179.vc5cb_98f6db_38 plugin-util-api 4.1.0 prism-api 1.29.0-13 +prometheus 763.vf8c26b_a_34b_d6 promoted-builds 945.v597f5c6a_d3fd -rebuild 330.v645b_7df10e2a_ +rebuild 332.va_1ee476d8f6d resource-disposer 0.23 run-condition 1.7 -scm-api 683.vb_16722fb_b_80b_ -script-security 1326.vdb_c154de8669 +scm-api 689.v237b_6d3a_ef7f +script-security 1335.vf07d9ce377a_e simple-theme-plugin 176.v39740c03a_a_f5 snakeyaml-api 2.2-111.vc6598e30cc65 sonar 2.17.2 -ssh-agent 346.vda_a_c4f2c8e50 -ssh-credentials 322.v124df57ed808 +ssh-agent 367.vf9076cd4ee21 +ssh-credentials 337.v395d2403ccd4 ssh-slaves 2.948.vb_8050d697fec structs 337.v1b_04ea_4df7c8 timestamper 1.26 token-macro 400.v35420b_922dcb_ -trilead-api 2.141.v284120fd0c46 +trilead-api 2.142.v748523a_76693 variant 60.v7290fc0eb_b_cd -warnings-ng 11.1.0 +warnings-ng 11.3.0 workflow-aggregator 596.v8c21c963d92d workflow-api 1291.v51fd2a_625da_7 workflow-basic-steps 1049.v257a_e6b_30fb_d -workflow-cps 3883.vb_3ff2a_e3eea_f +workflow-cps 3894.vd0f0248b_a_fc4 workflow-durable-task-step 1331.vc8c2fed35334 workflow-job 1385.vb_58b_86ea_fff1 workflow-multibranch 773.vc4fe1378f1d5 -workflow-scm-step 415.v434365564324 +workflow-scm-step 427.v4ca_6512e7df1 workflow-step-api 657.v03b_e8115821b_ -workflow-support 865.v43e78cc44e0d +workflow-support 896.v175a_a_9c5b_78f ws-cleanup 0.45 xvnc 1.28 diff --git a/instances/automotive.openpass/target/jenkins/quicksilver.css.override b/instances/automotive.openpass/target/jenkins/quicksilver.css.override index e7866d2f7..b9ac16a88 100644 --- a/instances/automotive.openpass/target/jenkins/quicksilver.css.override +++ b/instances/automotive.openpass/target/jenkins/quicksilver.css.override @@ -48,8 +48,9 @@ A.page-header__brand-link:visited { text-decoration: none; } +#page-header .page-header__hyperlinks a:link, #page-header .page-header__hyperlinks a:active, -#page-header .page-header__hyperlinks a:link { +#page-header .page-header__hyperlinks a:visited { color: #ffffff; font-weight: bold; } @@ -83,6 +84,10 @@ footer { display: none; } +a, a:link { + color: #3f7b96; +} + a:visited { color: #af6e3d; } @@ -92,13 +97,10 @@ a:focus, a:hover { text-decoration: none; } -a:active, a:hover { +a:hover, a:active { outline: 0; } -a, a:link { - color: #3f7b96; -} body, table, form, input, td, th, p, textarea, select { font-family: Libre Franklin,Helvetica Neue,Helvetica,Arial,sans-serif; diff --git a/instances/automotive.openpass/target/k8s/configmap-jenkins-config.yml b/instances/automotive.openpass/target/k8s/configmap-jenkins-config.yml index 04e71a5c2..f39a78a7c 100644 --- a/instances/automotive.openpass/target/k8s/configmap-jenkins-config.yml +++ b/instances/automotive.openpass/target/k8s/configmap-jenkins-config.yml @@ -590,6 +590,35 @@ data: showBuildBadges: "never" showChangeReasonCommentWindow: false skipDuplicateHistory: true + prometheusConfiguration: + appendParamLabel: false + appendStatusLabel: false + collectCodeCoverage: false + collectDiskUsage: true + collectNodeStatus: true + collectingMetricsPeriodInSeconds: 120 + countAbortedBuilds: true + countFailedBuilds: true + countNotBuiltBuilds: true + countSuccessfulBuilds: true + countUnstableBuilds: true + defaultNamespace: "" + disabledMetricConfig: + entries: + - regexDisabledMetric: + regex: "jenkins_builds_last_stage_duration.*" + - regexDisabledMetric: + regex: "jvm_.*" + - regexDisabledMetric: + regex: "vm_memory.*" + - regexDisabledMetric: + regex: "jenkins_builds_discard_active.*" + fetchTestResults: true + jobAttributeName: "jenkins_job" + path: "prometheus" + perBuildMetrics: false + processingDisabledBuilds: false + useAuthenticatedEndpoint: false gitLabConnectionConfig: connections: - apiTokenId: "gitlab-api-token" @@ -605,6 +634,28 @@ data: name: "gitlab.eclipse.org" serverUrl: "https://gitlab.eclipse.org" webhookSecretCredentialsId: "gitlab-webhook-secret" + globalLibraries: + libraries: + - name: "releng-pipeline" + defaultVersion: "main" + retriever: + modernSCM: + scm: + gitlab: + credentialsId: "gitlab-bot-ssh" + id: "75d03fa0-fb63-4565-89e2-b3247ea349e3" + projectOwner: "eclipsefdn/it/releng/jenkins-pipeline-service" + projectPath: "eclipsefdn/it/releng/jenkins-pipeline-service/jenkins-pipeline-library" + serverName: "gitlab.eclipse.org" + traits: + - gitLabBranchDiscovery: + strategyId: 1 + - gitLabOriginDiscovery: + strategyId: 2 + - gitLabForkDiscovery: + buildMRForksNotMirror: false + strategyId: 2 + trust: "gitLabTrustPermissions" tool: jdk: installations: