fix: shared library path in webdev instance

Signed-off-by: sebastien.heurtematte <sebastien.heurtematte@eclipse-foundation.org>
eclipse-cbi · Apr 5, 2024 · 4562d44 · 4562d44
1 parent cc6df44
commit 4562d44
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/instances/foundation-internal.webdev/jenkins/configuration.yml b/instances/foundation-internal.webdev/jenkins/configuration.yml
@@ -58,7 +58,7 @@ unclassified:
             gitlab:
               credentialsId: "gitlab-credentials"
               id: "c5c54f66-beeb-4d2f-905f-c225e7586b8b"
-              projectOwner: "eclipsefdn/it/releng"
+              projectOwner: "eclipsefdn/it/releng/jenkins-pipeline-service"
               projectPath: "eclipsefdn/it/releng/jenkins-pipeline-service/jenkins-pipeline-library"
               serverName: "gitlab.eclipse.org"
               traits:

diff --git a/instances/foundation-internal.webdev/target/config.json b/instances/foundation-internal.webdev/target/config.json
@@ -540,7 +540,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 [\"/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 [\"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",
       "home": "/var/jenkins",
       "id": "2.426.3",
       "key_fingerprint": "5BA31D57EF5975CA",

diff --git a/instances/foundation-internal.webdev/target/jenkins/configuration.yml b/instances/foundation-internal.webdev/target/jenkins/configuration.yml
@@ -574,7 +574,7 @@ unclassified:
               gitlab:
                 credentialsId: "gitlab-credentials"
                 id: "c5c54f66-beeb-4d2f-905f-c225e7586b8b"
-                projectOwner: "eclipsefdn/it/releng"
+                projectOwner: "eclipsefdn/it/releng/jenkins-pipeline-service"
                 projectPath: "eclipsefdn/it/releng/jenkins-pipeline-service/jenkins-pipeline-library"
                 serverName: "gitlab.eclipse.org"
                 traits:

diff --git a/instances/foundation-internal.webdev/target/jenkins/plugins.log b/instances/foundation-internal.webdev/target/jenkins/plugins.log
@@ -11,7 +11,7 @@ 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

diff --git a/instances/foundation-internal.webdev/target/k8s/configmap-jenkins-config.yml b/instances/foundation-internal.webdev/target/k8s/configmap-jenkins-config.yml
@@ -597,7 +597,7 @@ data:
                   gitlab:
                     credentialsId: "gitlab-credentials"
                     id: "c5c54f66-beeb-4d2f-905f-c225e7586b8b"
-                    projectOwner: "eclipsefdn/it/releng"
+                    projectOwner: "eclipsefdn/it/releng/jenkins-pipeline-service"
                     projectPath: "eclipsefdn/it/releng/jenkins-pipeline-service/jenkins-pipeline-library"
                     serverName: "gitlab.eclipse.org"
                     traits: