You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/02/22 10:46:30 UTC
[incubator-dlab] branch EPMCDLAB-1186 updated: fixed issue with
nexus
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch EPMCDLAB-1186
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/EPMCDLAB-1186 by this push:
new f35f200 fixed issue with nexus
f35f200 is described below
commit f35f200012551939e714ebb0f5e21519481f1b72
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Fri Feb 22 12:46:20 2019 +0200
fixed issue with nexus
---
.../scripts/deploy_repository/deploy_repository.py | 36 +++++++++++-----------
.../templates/configureNexus.groovy | 18 +++++------
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
index 8bc839c..642101d 100644
--- a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
+++ b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
@@ -880,24 +880,24 @@ def install_nexus():
put('templates/configureNexus.groovy', '/tmp/configureNexus.groovy')
sudo('sed -i "s/REGION/{}/g" /tmp/configureNexus.groovy'.format(args.region))
sudo('sed -i "s/ADMIN_PASSWORD/{}/g" /tmp/configureNexus.groovy'.format(args.nexus_admin_password))
- sudo('sed -i "s/PYPI_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
- configuration['local_repository_pypi_repo']))
- sudo('sed -i "s/MAVEN_CENTRAL_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
- configuration['local_repository_maven_central_repo']))
- sudo('sed -i "s/MAVEN_BINTRAY_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
- configuration['local_repository_maven_bintray_repo']))
- sudo('sed -i "s/DOCKER_INTERNAL_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
- configuration['local_repository_docker_internal_repo']))
- sudo('sed -i "s/DOCKER_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
- configuration['local_repository_docker_repo']))
- sudo('sed -i "s/JENKINS_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
- configuration['local_repository_jenkins_repo']))
- sudo('sed -i "s/MONGO_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
- configuration['local_repository_mongo_repo']))
- sudo('sed -i "s/PACKAGES_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
- configuration['local_repository_packages_repo']))
- sudo('sed -i "s/NPM_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
- configuration['local_repository_npm_repo']))
+ # sudo('sed -i "s/PYPI_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
+ # configuration['local_repository_pypi_repo']))
+ # sudo('sed -i "s/MAVEN_CENTRAL_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
+ # configuration['local_repository_maven_central_repo']))
+ # sudo('sed -i "s/MAVEN_BINTRAY_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
+ # configuration['local_repository_maven_bintray_repo']))
+ # sudo('sed -i "s/DOCKER_INTERNAL_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
+ # configuration['local_repository_docker_internal_repo']))
+ # sudo('sed -i "s/DOCKER_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
+ # configuration['local_repository_docker_repo']))
+ # sudo('sed -i "s/JENKINS_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
+ # configuration['local_repository_jenkins_repo']))
+ # sudo('sed -i "s/MONGO_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
+ # configuration['local_repository_mongo_repo']))
+ # sudo('sed -i "s/PACKAGES_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
+ # configuration['local_repository_packages_repo']))
+ # sudo('sed -i "s/NPM_REPO_NAME/{}/g" /tmp/configureNexus.groovy'.format(
+ # configuration['local_repository_npm_repo']))
sudo('sed -i "s/SERVICE_USER_NAME/{}/g" /tmp/configureNexus.groovy'.format(args.nexus_service_user_name))
sudo('sed -i "s/SERVICE_USER_PASSWORD/{}/g" /tmp/configureNexus.groovy'.format(
args.nexus_service_user_password))
diff --git a/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy b/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
index ace4cfd..f284f25 100644
--- a/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
+++ b/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
@@ -27,15 +27,15 @@ repository.getRepositoryManager().delete('nuget.org-proxy');
blobStore.createFileBlobStore('artifacts_store', 'artifacts_store')
blobStore.createFileBlobStore('packages_store', 'packages_store')
blobStore.createFileBlobStore('docker_store', 'docker_store')
-repository.createPyPiProxy('PYPI_REPO_NAME','https://pypi.org/', 'packages_store', true)
-repository.createMavenProxy('MAVEN_CENTRAL_REPO_NAME','https://repo1.maven.org/maven2/', 'artifacts_store', true, VersionPolicy.RELEASE, LayoutPolicy.PERMISSIVE)
-repository.createMavenProxy('MAVEN_BINTRAY_REPO_NAME','https://dl.bintray.com/michaelklishin/maven/', 'artifacts_store', true, VersionPolicy.RELEASE, LayoutPolicy.PERMISSIVE)
-repository.createDockerHosted('DOCKER_INTERNAL_REPO_NAME', null, 8083, 'docker_store', true, true)
-repository.createRawProxy('DOCKER_REPO_NAME','https://download.docker.com/linux/ubuntu', 'packages_store')
-repository.createRawProxy('JENKINS_REPO_NAME','http://pkg.jenkins.io/debian-stable', 'packages_store')
-repository.createRawProxy('MONGO_REPO_NAME','http://repo.mongodb.org/apt/ubuntu', 'packages_store')
-repository.createRawHosted('PACKAGES_REPO_NAME', 'packages_store')
-repository.createNpmProxy('NPM_REPO_NAME', 'https://registry.npmjs.org', 'packages_store')
+repository.createPyPiProxy('pypi','https://pypi.org/', 'packages_store', true)
+repository.createMavenProxy('maven-central','https://repo1.maven.org/maven2/', 'artifacts_store', true, VersionPolicy.RELEASE, LayoutPolicy.PERMISSIVE)
+repository.createMavenProxy('maven-bintray','https://dl.bintray.com/michaelklishin/maven/', 'artifacts_store', true, VersionPolicy.RELEASE, LayoutPolicy.PERMISSIVE)
+repository.createDockerHosted('docker-internal', null, 8083, 'docker_store', true, true)
+repository.createRawProxy('docker','https://download.docker.com/linux/ubuntu', 'packages_store')
+repository.createRawProxy('jenkins','http://pkg.jenkins.io/debian-stable', 'packages_store')
+repository.createRawProxy('mongo','http://repo.mongodb.org/apt/ubuntu', 'packages_store')
+repository.createRawHosted('packages', 'packages_store')
+repository.createNpmProxy('npm', 'https://registry.npmjs.org', 'packages_store')
// create a role for service user
def role = new org.sonatype.nexus.security.role.Role(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org