From be7ca1b00043cfdeadbc0489a53d6a9f04f623d9 Mon Sep 17 00:00:00 2001 From: Mykola Serdiuk Date: Tue, 17 Dec 2024 17:26:04 +0200 Subject: [PATCH] chore: Update Naming Convention for Nexus-Operator Resources (#384) * Fix github build start templates --- charts/pipelines-library/Chart.lock | 2 +- .../resources/cm-gradle-settings.yaml | 6 +++--- .../templates/resources/cm-maven-settings.yaml | 6 +++--- .../templates/resources/cm-npm-settings.yaml | 18 +++++++++--------- .../templates/resources/cm-nuget-settings.yaml | 4 ++-- .../resources/cm-python-settings.yaml | 12 ++++++------ 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/charts/pipelines-library/Chart.lock b/charts/pipelines-library/Chart.lock index f6425d6e..92d92ae1 100644 --- a/charts/pipelines-library/Chart.lock +++ b/charts/pipelines-library/Chart.lock @@ -6,4 +6,4 @@ dependencies: repository: https://epam.github.io/edp-helm-charts/stable version: 0.4.1 digest: sha256:67e48f27bda2fc673cc79ba2a9c6dce61b6c5b00679303e85e11e3dc00b51719 -generated: "2024-12-23T11:08:17.822724+02:00" +generated: "2024-12-23T12:11:42.718002+02:00" diff --git a/charts/pipelines-library/templates/resources/cm-gradle-settings.yaml b/charts/pipelines-library/templates/resources/cm-gradle-settings.yaml index 988b9d81..8331b209 100644 --- a/charts/pipelines-library/templates/resources/cm-gradle-settings.yaml +++ b/charts/pipelines-library/templates/resources/cm-gradle-settings.yaml @@ -10,8 +10,8 @@ metadata: labels: {{- include "edp-tekton.labels" . | nindent 4 }} data: - SNAPSHOTS_REPO_PATH: "/repository/edp-maven-snapshots" - RELEASES_REPO_PATH: "/repository/edp-maven-releases" + SNAPSHOTS_REPO_PATH: "/repository/krci-maven-snapshots" + RELEASES_REPO_PATH: "/repository/krci-maven-releases" init.gradle: | // Copyright 2024 EPAM Systems. // @@ -52,7 +52,7 @@ data: username = System.getenv("CI_USERNAME") password = System.getenv("CI_PASSWORD") } - url = System.getenv("NEXUS_HOST_URL") + "/repository/edp-maven-group" + url = System.getenv("NEXUS_HOST_URL") + "/repository/krci-maven-group" allowInsecureProtocol = true } maven { diff --git a/charts/pipelines-library/templates/resources/cm-maven-settings.yaml b/charts/pipelines-library/templates/resources/cm-maven-settings.yaml index 5d17a76d..c4aa658a 100644 --- a/charts/pipelines-library/templates/resources/cm-maven-settings.yaml +++ b/charts/pipelines-library/templates/resources/cm-maven-settings.yaml @@ -72,7 +72,7 @@ data: nexus * - http://nexus.nexus:8081/repository/edp-maven-group + http://nexus.nexus:8081/repository/krci-maven-group @@ -95,8 +95,8 @@ data: nexus - nexus::http://nexus.nexus:8081/repository/edp-maven-snapshots - nexus::http://nexus.nexus:8081/repository/edp-maven-releases + nexus::http://nexus.nexus:8081/repository/krci-maven-snapshots + nexus::http://nexus.nexus:8081/repository/krci-maven-releases diff --git a/charts/pipelines-library/templates/resources/cm-npm-settings.yaml b/charts/pipelines-library/templates/resources/cm-npm-settings.yaml index f9f3a744..6df522eb 100644 --- a/charts/pipelines-library/templates/resources/cm-npm-settings.yaml +++ b/charts/pipelines-library/templates/resources/cm-npm-settings.yaml @@ -11,36 +11,36 @@ metadata: {{- include "edp-tekton.labels" . | nindent 4 }} data: .npmrc-ci: | - registry=${NEXUS_HOST_URL}/repository/edp-npm-group - ${NEXUS_HOST}/repository/:email=ci.user@edp.com + registry=${NEXUS_HOST_URL}/repository/krci-npm-group + ${NEXUS_HOST}/repository/:email=ci.user@krci.com ${NEXUS_HOST}/repository/:_auth=${upBase64} cache=${NPM_CACHE_DIR} .npmrc-publish-snapshots: | - registry=${NEXUS_HOST_URL}/repository/edp-npm-snapshots - ${NEXUS_HOST}/repository/:email=ci.user@edp.com + registry=${NEXUS_HOST_URL}/repository/krci-npm-snapshots + ${NEXUS_HOST}/repository/:email=ci.user@krci.com ${NEXUS_HOST}/repository/:_auth=${upBase64} cache=${NPM_CACHE_DIR} .npmrc-publish-releases: | - registry=${NEXUS_HOST_URL}/repository/edp-npm-releases - ${NEXUS_HOST}/repository/:email=ci.user@edp.com + registry=${NEXUS_HOST_URL}/repository/krci-npm-releases + ${NEXUS_HOST}/repository/:email=ci.user@krci.com ${NEXUS_HOST}/repository/:_auth=${upBase64} cache=${NPM_CACHE_DIR} # Example of how to push changes when using Node.js version 18.10.0 with the node:18.10-alpine3.16 image # .npmrc-ci: | - # registry=${NEXUS_HOST_URL}/repository/edp-npm-group + # registry=${NEXUS_HOST_URL}/repository/krci-npm-group # _auth=${upBase64} # cache=${NPM_CACHE_DIR} # .npmrc-publish-snapshots: | - # registry=${NEXUS_HOST_URL}/repository/edp-npm-snapshots + # registry=${NEXUS_HOST_URL}/repository/krci-npm-snapshots # _auth=${upBase64} # cache=${NPM_CACHE_DIR} # .npmrc-publish-releases: | - # registry=${NEXUS_HOST_URL}/repository/edp-npm-releases + # registry=${NEXUS_HOST_URL}/repository/krci-npm-releases # _auth=${upBase64} # cache=${NPM_CACHE_DIR} diff --git a/charts/pipelines-library/templates/resources/cm-nuget-settings.yaml b/charts/pipelines-library/templates/resources/cm-nuget-settings.yaml index 27b23a9f..3b15a316 100644 --- a/charts/pipelines-library/templates/resources/cm-nuget-settings.yaml +++ b/charts/pipelines-library/templates/resources/cm-nuget-settings.yaml @@ -14,8 +14,8 @@ data: - - + + diff --git a/charts/pipelines-library/templates/resources/cm-python-settings.yaml b/charts/pipelines-library/templates/resources/cm-python-settings.yaml index de20088e..302c355e 100644 --- a/charts/pipelines-library/templates/resources/cm-python-settings.yaml +++ b/charts/pipelines-library/templates/resources/cm-python-settings.yaml @@ -12,21 +12,21 @@ metadata: {{- include "edp-tekton.labels" . | nindent 4 }} data: # Private repo index path PIP searches through. It is used by 'pip search' command. - # e.g. '/repository/edp-python-group/pypi' - PIP_INDEX_PATH: "/repository/edp-python-group/pypi" + # e.g. '/repository/krci-python-group/pypi' + PIP_INDEX_PATH: "/repository/krci-python-group/pypi" # Repo index path from wich PIP downloads private packages and public packages via proxy. # PIP_INDEX_URL can have only one URL while PIP_EXTRA_INDEX_URL can hold # multiple URLs if passed with spaces. It is used by 'pip install' command. # To access index via web, add slash at the end of 'simple/'. - # e.g. '/repository/edp-python-group/simple' - PIP_INDEX_URL_PATH: "/repository/edp-python-group/simple" + # e.g. '/repository/krci-python-group/simple' + PIP_INDEX_URL_PATH: "/repository/krci-python-group/simple" # Path for the snapshots repository in artifact storage. - REPOSITORY_SNAPSHOTS_PATH: "/repository/edp-python-snapshots/" + REPOSITORY_SNAPSHOTS_PATH: "/repository/krci-python-snapshots/" # Path for the releases repository in artifact storage - REPOSITORY_RELEASES_PATH: "/repository/edp-python-releases/" + REPOSITORY_RELEASES_PATH: "/repository/krci-python-releases/" # Example for pushing a snapshot and a release packages package to GitLab # Ref: https://docs.gitlab.com/ee/user/packages/pypi_repository/