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 91cf033 fixed issue with nexus
91cf033 is described below
commit 91cf0337bcfbc4ecca152ac0ba42ed08b9d92d89
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Fri Feb 22 13:21:01 2019 +0200
fixed issue with nexus
---
.../scripts/deploy_repository/deploy_repository.py | 20 ++++++++++----------
.../templates/addCustomRepository.groovy | 10 +++++-----
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
index 642101d..47013f3 100644
--- a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
+++ b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
@@ -999,16 +999,16 @@ def install_nexus():
nexus_service_waiter()
put('templates/addCustomRepository.groovy',
'/tmp/addCustomRepository.groovy')
sudo('sed -i "s|REGION|{0}|g"
/tmp/addCustomRepository.groovy'.format(args.region))
- sudo('sed -i "s|APT_UBUNTU_REPO_NAME|{0}|g"
/tmp/addCustomRepository.groovy'.format(
- configuration['local_repository_apt_ubuntu_repo']))
- sudo('sed -i "s|APT_SECURITY_REPO_NAME|{0}|g"
/tmp/addCustomRepository.groovy'.format(
- configuration['local_repository_apt_ubuntu_security_repo']))
- sudo('sed -i "s|APT_BINTRAY_REPO_NAME|{0}|g"
/tmp/addCustomRepository.groovy'.format(
- configuration['local_repository_apt_bintray_repo']))
- sudo('sed -i "s|RRUTTER_REPO_NAME|{0}|g"
/tmp/addCustomRepository.groovy'.format(
- configuration['local_repository_rrutter_repo']))
- sudo('sed -i "s|R_REPO_NAME|{0}|g"
/tmp/addCustomRepository.groovy'.format(
- configuration['local_repository_r_repo']))
+ # sudo('sed -i "s|APT_UBUNTU_REPO_NAME|{0}|g"
/tmp/addCustomRepository.groovy'.format(
+ # configuration['local_repository_apt_ubuntu_repo']))
+ # sudo('sed -i "s|APT_SECURITY_REPO_NAME|{0}|g"
/tmp/addCustomRepository.groovy'.format(
+ # configuration['local_repository_apt_ubuntu_security_repo']))
+ # sudo('sed -i "s|APT_BINTRAY_REPO_NAME|{0}|g"
/tmp/addCustomRepository.groovy'.format(
+ # configuration['local_repository_apt_bintray_repo']))
+ # sudo('sed -i "s|RRUTTER_REPO_NAME|{0}|g"
/tmp/addCustomRepository.groovy'.format(
+ # configuration['local_repository_rrutter_repo']))
+ # sudo('sed -i "s|R_REPO_NAME|{0}|g"
/tmp/addCustomRepository.groovy'.format(
+ # configuration['local_repository_r_repo']))
script_executed = False
while not script_executed:
try:
diff --git
a/infrastructure-provisioning/scripts/deploy_repository/templates/addCustomRepository.groovy
b/infrastructure-provisioning/scripts/deploy_repository/templates/addCustomRepository.groovy
index d8693e4..e488bee 100644
---
a/infrastructure-provisioning/scripts/deploy_repository/templates/addCustomRepository.groovy
+++
b/infrastructure-provisioning/scripts/deploy_repository/templates/addCustomRepository.groovy
@@ -4,7 +4,7 @@ import org.sonatype.nexus.repository.storage.WritePolicy
ubuntuProxyConfiguration = new Configuration(
- repositoryName: "APT_UBUNTU_REPO_NAME",
+ repositoryName: "ubuntu",
recipeName: "apt-proxy",
online: true,
attributes: [
@@ -35,7 +35,7 @@ ubuntuProxyConfiguration = new Configuration(
] as Map
)
securityProxyConfiguration = new Configuration(
- repositoryName: "APT_SECURITY_REPO_NAME",
+ repositoryName: "ubuntu-security",
recipeName: "apt-proxy",
online: true,
attributes: [
@@ -66,7 +66,7 @@ securityProxyConfiguration = new Configuration(
] as Map
)
BintrayDebianProxyConfiguration = new Configuration(
- repositoryName: "APT_BINTRAY_REPO_NAME",
+ repositoryName: "ubuntu-bintray",
recipeName: "apt-proxy",
online: true,
attributes: [
@@ -97,7 +97,7 @@ BintrayDebianProxyConfiguration = new Configuration(
] as Map
)
RrutterDebianProxyConfiguration = new Configuration(
- repositoryName: "RRUTTER_REPO_NAME",
+ repositoryName: "rrutter",
recipeName: "apt-proxy",
online: true,
attributes: [
@@ -128,7 +128,7 @@ RrutterDebianProxyConfiguration = new Configuration(
] as Map
)
RProxyConfiguration = new Configuration(
- repositoryName: "R_REPO_NAME",
+ repositoryName: "r",
recipeName: "r-proxy",
online: true,
attributes: [
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
